From 986ef4e69c6dbe6e9c56b9322ce1ee976763d2eb Mon Sep 17 00:00:00 2001 From: Alejandro Colomar Date: Fri, 30 Dec 2022 19:42:17 +0100 Subject: [PATCH] Use naming consistent with other common functions arc4random(3) returns a number. arc4random_buf(3) fills a buffer. arc4random_uniform(3) returns a number less than a bound. and I'd add a hypothetical one which we use: *_interval() should return a number within the interval [min, max]. In reality, the function being called csrand() in this patch is not really cryptographically secure, since it had a bias, but a subsequent patch will fix that. Signed-off-by: Alejandro Colomar --- libmisc/salt.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libmisc/salt.c b/libmisc/salt.c index fd28145c..90ff702f 100644 --- a/libmisc/salt.c +++ b/libmisc/salt.c @@ -89,7 +89,7 @@ #define GENSALT_SETTING_SIZE 100 /* local function prototypes */ -static long read_random_bytes (void); +static long csrand (void); #if !USE_XCRYPT_GENSALT static /*@observer@*/const char *gensalt (size_t salt_size); #endif /* !USE_XCRYPT_GENSALT */ @@ -110,7 +110,7 @@ static /*@observer@*/void YESCRYPT_salt_cost_to_buf (char *buf, unsigned long co #endif /* USE_YESCRYPT */ /* Read sizeof (long) random bytes from /dev/urandom. */ -static long read_random_bytes (void) +static long csrand (void) { long randval = 0; @@ -168,7 +168,7 @@ static unsigned long csrand_interval (unsigned long min, unsigned long max) double drand; long ret; - drand = (double) (read_random_bytes () & RAND_MAX) / (double) RAND_MAX; + drand = (double) (csrand () & RAND_MAX) / (double) RAND_MAX; drand *= (double) (max - min + 1); /* On systems were this is not random() range is lower, we favor * higher numbers of salt. */ @@ -401,9 +401,9 @@ static /*@observer@*/const char *gensalt (size_t salt_size) assert (salt_size >= MIN_SALT_SIZE && salt_size <= MAX_SALT_SIZE); - strcat (salt, l64a (read_random_bytes ())); + strcat (salt, l64a (csrand ())); do { - strcat (salt, l64a (read_random_bytes ())); + strcat (salt, l64a (csrand ())); } while (strlen (salt) < salt_size); salt[salt_size] = '\0';