-fixes

[oweals/gnunet.git] / src / util / crypto_random.c

diff --git a/src/util/crypto_random.c b/src/util/crypto_random.c
index a1485029e3551ab6d1221dd7aeb06a5610fe9840..25226a3b478a48d7bb3a0952991a06928c5de609 100644 (file)
--- a/src/util/crypto_random.c
+++ b/src/util/crypto_random.c
@@ -38,10 +38,10 @@
 /* The code is derived from glibc, obviously */
 #if MINGW
 #ifdef RANDOM
-#  undef RANDOM
+#undef RANDOM
 #endif
 #ifdef SRANDOM
-#  undef SRANDOM
+#undef SRANDOM
 #endif
 #define RANDOM() glibc_weak_rand32()
 #define SRANDOM(s) glibc_weak_srand32(s)
@@ -57,6 +57,7 @@ int32_t
 glibc_weak_rand32 ()
 {
   int32_t val = glibc_weak_rand32_state;
+
   val = ((glibc_weak_rand32_state * 1103515245) + 12345) & 0x7fffffff;
   glibc_weak_rand32_state = val;
   return val;
@@ -279,9 +280,10 @@ entropy_generator (void *cls, const char *what, int printchar, int current,
   LOG (GNUNET_ERROR_TYPE_INFO, _("Starting `%s' process to generate entropy\n"),
        "find");
   genproc =
-      GNUNET_OS_start_process (NULL, NULL, "sh", "sh", "-c",
-                               "exec find / -mount -type f -exec cp {} /dev/null \\; 2>/dev/null",
-                               NULL);
+     GNUNET_OS_start_process (GNUNET_NO,
+                             NULL, NULL, "sh", "sh", "-c",
+                             "exec find / -mount -type f -exec cp {} /dev/null \\; 2>/dev/null",
+                             NULL);
 }
 
 
@@ -302,19 +304,23 @@ void __attribute__ ((constructor)) GNUNET_CRYPTO_random_init ()
   gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
   if (!gcry_check_version (GCRYPT_VERSION))
   {
-    fprintf (stderr,
+    FPRINTF (stderr,
              _
              ("libgcrypt has not the expected version (version %s is required).\n"),
              GCRYPT_VERSION);
     GNUNET_abort ();
   }
+#ifdef GCRYCTL_INITIALIZATION_FINISHED
+  gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
+#endif
 #ifdef gcry_fast_random_poll
   gcry_fast_random_poll ();
 #endif
   gcry_set_progress_handler (&entropy_generator, NULL);
   atexit (&killfind);
   GNUNET_CRYPTO_seed_weak_random (time (NULL) ^
-      GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX));
+                                  GNUNET_CRYPTO_random_u32
+                                  (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX));
 }