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

* libmisc/salt.c: Use a size_t for the size of strings instead of

Browse Source 
unsigned int.
	* libmisc/salt.c: Add brackets and parenthesis.
	* libmisc/salt.c: Avoid assignments in comparisons.
This commit is contained in:
nekral-guest 2008-06-13 19:37:15 +00:00
parent 0a6ce91369
commit 7f8c48834f
2 changed files with 39 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2008-06-13 Nicolas François <nicolas.francois@centraliens.net>
* libmisc/salt.c: Use a size_t for the size of strings instead of
unsigned int.
* libmisc/salt.c: Add brackets and parenthesis.
* libmisc/salt.c: Avoid assignments in comparisons.
2008-06-13 Nicolas François <nicolas.francois@centraliens.net> 2008-06-13 Nicolas François <nicolas.francois@centraliens.net>
* libmisc/age.c: fork() and wait return a pid_t, not an int. * libmisc/age.c: fork() and wait return a pid_t, not an int.

50
libmisc/salt.c
View File

@ -24,9 +24,9 @@
char *l64a(long value); char *l64a(long value);
#endif /* !HAVE_L64A */ #endif /* !HAVE_L64A */
static void seedRNG (void); static void seedRNG (void);
static char *gensalt (unsigned int salt_size); static char *gensalt (size_t salt_size);
#ifdef USE_SHA_CRYPT #ifdef USE_SHA_CRYPT
static unsigned int SHA_salt_size (void); static size_t SHA_salt_size (void);
static const char *SHA_salt_rounds (int *prefered_rounds); static const char *SHA_salt_rounds (int *prefered_rounds);
#endif /* USE_SHA_CRYPT */ #endif /* USE_SHA_CRYPT */
@ -46,14 +46,15 @@ static char *l64a(long value)
for (i = 0; value != 0 && i < 6; i++) { for (i = 0; value != 0 && i < 6; i++) {
digit = value & 0x3f; digit = value & 0x3f;
if (digit < 2) if (digit < 2) {
*s = digit + '.'; *s = digit + '.';
else if (digit < 12) } else if (digit < 12) {
*s = digit + '0' - 2; *s = digit + '0' - 2;
else if (digit < 38) } else if (digit < 38) {
*s = digit + 'A' - 12; *s = digit + 'A' - 12;
else } else {
*s = digit + 'a' - 38; *s = digit + 'a' - 38;
}
value >>= 6; value >>= 6;
s++; s++;
@ -88,12 +89,12 @@ static void seedRNG (void)
* The size of the salt string is between 8 and 16 bytes for the SHA crypt * The size of the salt string is between 8 and 16 bytes for the SHA crypt
* methods. * methods.
*/ */
static unsigned int SHA_salt_size (void) static size_t SHA_salt_size (void)
{ {
double rand_size; double rand_size;
seedRNG (); seedRNG ();
rand_size = (double) 9.0 * random () / RAND_MAX; rand_size = (double) 9.0 * random () / RAND_MAX;
return 8 + rand_size; return (size_t) (8 + rand_size);
} }
/* ! Arguments evaluated twice ! */ /* ! Arguments evaluated twice ! */
@ -120,41 +121,49 @@ static const char *SHA_salt_rounds (int *prefered_rounds)
long max_rounds = getdef_long ("SHA_CRYPT_MAX_ROUNDS", -1); long max_rounds = getdef_long ("SHA_CRYPT_MAX_ROUNDS", -1);
double rand_rounds; double rand_rounds;
if (-1 == min_rounds && -1 == max_rounds) if ((-1 == min_rounds) && (-1 == max_rounds)) {
return ""; return "";
}
if (-1 == min_rounds) if (-1 == min_rounds) {
min_rounds = max_rounds; min_rounds = max_rounds;
}
if (-1 == max_rounds) if (-1 == max_rounds) {
max_rounds = min_rounds; max_rounds = min_rounds;
}
if (min_rounds > max_rounds) if (min_rounds > max_rounds) {
max_rounds = min_rounds; max_rounds = min_rounds;
}
seedRNG (); seedRNG ();
rand_rounds = (double) (max_rounds-min_rounds+1.0) * random (); rand_rounds = (double) (max_rounds-min_rounds+1.0) * random ();
rand_rounds /= RAND_MAX; rand_rounds /= RAND_MAX;
rounds = min_rounds + rand_rounds; rounds = min_rounds + rand_rounds;
} else if (0 == *prefered_rounds) } else if (0 == *prefered_rounds) {
return ""; return "";
else } else {
rounds = *prefered_rounds; rounds = *prefered_rounds;
}
/* Sanity checks. The libc should also check this, but this /* Sanity checks. The libc should also check this, but this
* protects against a rounds_prefix overflow. */ * protects against a rounds_prefix overflow. */
if (rounds < ROUNDS_MIN) if (rounds < ROUNDS_MIN) {
rounds = ROUNDS_MIN; rounds = ROUNDS_MIN;
}
if (rounds > ROUNDS_MAX) if (rounds > ROUNDS_MAX) {
rounds = ROUNDS_MAX; rounds = ROUNDS_MAX;
}
snprintf (rounds_prefix, 18, "rounds=%ld$", rounds); snprintf (rounds_prefix, 18, "rounds=%ld$", rounds);
/* Sanity checks. That should not be necessary. */ /* Sanity checks. That should not be necessary. */
rounds_prefix[17] = '\0'; rounds_prefix[17] = '\0';
if ('$' != rounds_prefix[16]) if ('$' != rounds_prefix[16]) {
rounds_prefix[17] = '$'; rounds_prefix[17] = '$';
}
return rounds_prefix; return rounds_prefix;
} }
@ -166,7 +175,7 @@ static const char *SHA_salt_rounds (int *prefered_rounds)
#define MAX_SALT_SIZE 16 #define MAX_SALT_SIZE 16
#define MIN_SALT_SIZE 8 #define MIN_SALT_SIZE 8
static char *gensalt (unsigned int salt_size) static char *gensalt (size_t salt_size)
{ {
static char salt[32]; static char salt[32];
@ -179,6 +188,7 @@ static char *gensalt (unsigned int salt_size)
do { do {
strcat (salt, l64a (random())); strcat (salt, l64a (random()));
} while (strlen (salt) < salt_size); } while (strlen (salt) < salt_size);
salt[salt_size] = '\0'; salt[salt_size] = '\0';
return salt; return salt;
@ -216,9 +226,11 @@ char *crypt_make_salt (const char *meth, void *arg)
if (NULL != meth) if (NULL != meth)
method = meth; method = meth;
else { else {
if ((method = getdef_str ("ENCRYPT_METHOD")) == NULL) method = getdef_str ("ENCRYPT_METHOD");
if (NULL == method) {
method = getdef_bool ("MD5_CRYPT_ENAB") ? "MD5" : "DES"; method = getdef_bool ("MD5_CRYPT_ENAB") ? "MD5" : "DES";
} }
}
if (0 == strcmp (method, "MD5")) { if (0 == strcmp (method, "MD5")) {
MAGNUM(result, '1'); MAGNUM(result, '1');