luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-09 18:54:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

win32: use real random data for seed on win32

Browse Source 
We can get cryptographically secure data from rand_s().

https://bugzilla.gnome.org/show_bug.cgi?id=710738
This commit is contained in:
Ryan Lortie
2013-10-25 12:22:42 -04:00
parent 2bf492e97d
commit 0e1924a66c
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
glib/grand.c
View File

@@ -37,6 +37,7 @@
*/ */
#include "config.h" #include "config.h"
#define _CRT_RAND_S
#include <math.h> #include <math.h>
#include <errno.h> #include <errno.h>
@@ -56,7 +57,7 @@
#include "gthread.h" #include "gthread.h"
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
#include <process.h> /* For getpid() */ #include <stdlib.h>
#endif #endif
/** /**
@@ -211,7 +212,8 @@ g_rand_new_with_seed_array (const guint32 *seed, guint seed_length)
* *
* Creates a new random number generator initialized with a seed taken * Creates a new random number generator initialized with a seed taken
* either from <filename>/dev/urandom</filename> (if existing) or from * either from <filename>/dev/urandom</filename> (if existing) or from
* the current time (as a fallback). * the current time (as a fallback). On Windows, the seed is taken from
* rand_s().
* *
* Return value: the new #GRand. * Return value: the new #GRand.
**/ **/
@@ -219,9 +221,9 @@ GRand*
g_rand_new (void) g_rand_new (void)
{ {
guint32 seed[4]; guint32 seed[4];
GTimeVal now;
#ifdef G_OS_UNIX #ifdef G_OS_UNIX
static gboolean dev_urandom_exists = TRUE; static gboolean dev_urandom_exists = TRUE;
GTimeVal now;
if (dev_urandom_exists) if (dev_urandom_exists)
{ {
@@ -253,9 +255,6 @@ g_rand_new (void)
else else
dev_urandom_exists = FALSE; dev_urandom_exists = FALSE;
} }
#else
static gboolean dev_urandom_exists = FALSE;
#endif
if (!dev_urandom_exists) if (!dev_urandom_exists)
{ {
@@ -263,12 +262,14 @@ g_rand_new (void)
seed[0] = now.tv_sec; seed[0] = now.tv_sec;
seed[1] = now.tv_usec; seed[1] = now.tv_usec;
seed[2] = getpid (); seed[2] = getpid ();
#ifdef G_OS_UNIX
seed[3] = getppid (); seed[3] = getppid ();
#else
seed[3] = 0;
#endif
} }
#else /* G_OS_WIN32 */
gint i;
for (i = 0; i < G_N_ELEMENTS (seed); i++)
rand_s (&seed[i]);
#endif
return g_rand_new_with_seed_array (seed, 4); return g_rand_new_with_seed_array (seed, 4);
} }