[Pkg-shadow-commits] r2788 - in upstream/trunk: . libmisc

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2009-04-24 22:49:20 +0000 (Fri, 24 Apr 2009)
New Revision: 2788

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/libmisc/salt.c
Log:
	* libmisc/salt.c: In case gettimeofday() fails, get some entropy
	from the PID.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2009-04-24 22:46:06 UTC (rev 2787)
+++ upstream/trunk/ChangeLog	2009-04-24 22:49:20 UTC (rev 2788)
@@ -1,5 +1,10 @@
 2009-04-25  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* libmisc/salt.c: In case gettimeofday() fails, get some entropy
+	from the PID.
+
+2009-04-25  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* libmisc/setupenv.c: Prefer snprintf to sprintf, even if a small
 	context indicates no issues.
 	* libmisc/setupenv.c: Avoid implicit conversion of pointers to

Modified: upstream/trunk/libmisc/salt.c
===================================================================
--- upstream/trunk/libmisc/salt.c	2009-04-24 22:46:06 UTC (rev 2787)
+++ upstream/trunk/libmisc/salt.c	2009-04-24 22:49:20 UTC (rev 2788)
@@ -69,8 +69,8 @@
 	static int seeded = 0;
 
 	if (0 == seeded) {
-		gettimeofday(&tv, NULL);
-		srandom (tv.tv_sec + tv.tv_usec);
+		(void) gettimeofday (&tv, NULL);
+		srandom (tv.tv_sec ^ tv.tv_usec ^ getpid ());
 		seeded = 1;
 	}
 }