From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Tue, 20 Nov 2007 09:20:34 +0000 (+0000)
Subject: Hopefully, I review my commits in the morning...
X-Git-Tag: 4.1.0~62
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb23bbfd988855cb5643ece26c101e39a28b75f4;p=shadow

Hopefully, I review my commits in the morning...
---

diff --git a/libmisc/salt.c b/libmisc/salt.c
index 9fb639d1..ec3de46c 100644
--- a/libmisc/salt.c
+++ b/libmisc/salt.c
@@ -52,6 +52,7 @@ char *l64a(long value)
 }
 #endif /* !HAVE_L64A */
 
+#ifdef ENCRYPTMETHOD_SELECT
 /*
  * Add the salt prefix.
  */
@@ -66,7 +67,8 @@ char *l64a(long value)
  */
 static unsigned int SHA_salt_size (void)
 {
-	return 8 + 8*rand ()/(RAND_MAX+1);
+	srand (time (NULL));
+	return 8 + (double)rand () * 9 / RAND_MAX;
 }
 
 /* ! Arguments evaluated twice ! */
@@ -102,7 +104,9 @@ static char *SHA_salt_rounds (void)
 	if (min_rounds > max_rounds)
 		max_rounds = min_rounds;
 
-	rounds = min_rounds + (max_rounds - min_rounds)*rand ()/(RAND_MAX+1);
+	srand (time (NULL));
+	rounds = min_rounds +
+	         (double)rand () * (max_rounds-min_rounds+1)/RAND_MAX;
 
 	/* Sanity checks. The libc should also check this, but this
 	 * protects against a rounds_prefix overflow. */
@@ -121,6 +125,7 @@ static char *SHA_salt_rounds (void)
 
 	return rounds_prefix;
 }
+#endif
 
 /*
  * Generate 8 base64 ASCII characters of random salt.  If MD5_CRYPT_ENAB
@@ -180,9 +185,9 @@ char *crypt_make_salt (void)
 	 * Concatenate a pseudo random salt.
 	 */
 	gettimeofday (&tv, (struct timezone *) 0);
-	strncat (result, sizeof(result), l64a (tv.tv_usec));
-	strncat (result, sizeof(result),
-		 l64a (tv.tv_sec + getpid () + clock ()));
+	strncat (result, l64a (tv.tv_usec), sizeof(result));
+	strncat (result, l64a (tv.tv_sec + getpid () + clock ()),
+	         sizeof(result));
 
 	if (strlen (result) > max_salt_len)	/* magic+salt */
 		result[max_salt_len] = '\0';