emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Fix types of the csrand_interval() API

Browse Source 
We were always casting the result to u_long.  Better just use that type
in the function.  Since we're returning u_long, it makes sense to also
specify the input as u_long.  In fact, that'll help for doing bitwise
operations inside this function.

Signed-off-by: Alejandro Colomar <alx@kernel.org>
This commit is contained in:
Alejandro Colomar 2022-12-30 18:50:21 +01:00 committed by Serge Hallyn
parent 8f441c9f7a
commit 6d2337d9e8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libmisc/salt.c
View File

@ -94,7 +94,7 @@ static long read_random_bytes (void);
static /*@observer@*/const char *gensalt (size_t salt_size); static /*@observer@*/const char *gensalt (size_t salt_size);
#endif /* !USE_XCRYPT_GENSALT */ #endif /* !USE_XCRYPT_GENSALT */
#if defined(USE_SHA_CRYPT) || defined(USE_BCRYPT) #if defined(USE_SHA_CRYPT) || defined(USE_BCRYPT)
static long csrand_interval (long min, long max); static unsigned long csrand_interval (unsigned long min, unsigned long max);
#endif /* USE_SHA_CRYPT || USE_BCRYPT */ #endif /* USE_SHA_CRYPT || USE_BCRYPT */
#ifdef USE_SHA_CRYPT #ifdef USE_SHA_CRYPT
static /*@observer@*/unsigned long SHA_get_salt_rounds (/*@null@*/const int *prefered_rounds); static /*@observer@*/unsigned long SHA_get_salt_rounds (/*@null@*/const int *prefered_rounds);
@ -163,7 +163,7 @@ end:
* *
* It favors slightly the higher numbers. * It favors slightly the higher numbers.
*/ */
static long csrand_interval (long min, long max) static unsigned long csrand_interval (unsigned long min, unsigned long max)
{ {
double drand; double drand;
long ret; long ret;
@ -207,7 +207,7 @@ static /*@observer@*/unsigned long SHA_get_salt_rounds (/*@null@*/const int *pre
max_rounds = min_rounds; max_rounds = min_rounds;
} }
rounds = (unsigned long) csrand_interval (min_rounds, max_rounds); rounds = csrand_interval (min_rounds, max_rounds);
} }
} else if (0 == *prefered_rounds) { } else if (0 == *prefered_rounds) {
rounds = SHA_ROUNDS_DEFAULT; rounds = SHA_ROUNDS_DEFAULT;
@ -280,7 +280,7 @@ static /*@observer@*/unsigned long BCRYPT_get_salt_rounds (/*@null@*/const int *
max_rounds = min_rounds; max_rounds = min_rounds;
} }
rounds = (unsigned long) csrand_interval (min_rounds, max_rounds); rounds = csrand_interval (min_rounds, max_rounds);
} }
} else if (0 == *prefered_rounds) { } else if (0 == *prefered_rounds) {
rounds = B_ROUNDS_DEFAULT; rounds = B_ROUNDS_DEFAULT;