- test for external iterator

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

diff --git a/src/util/crypto_random.c b/src/util/crypto_random.c
index 121dbef9a544809cf56b9498243e729bec433347..ca0d7ccc03e87d3bf2354084deb882b62e18508e 100644 (file)
--- a/src/util/crypto_random.c
+++ b/src/util/crypto_random.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2001, 2002, 2003, 2004, 2005, 2006 Christian Grothoff (and other contributing authors)
+     (C) 2001, 2002, 2003, 2004, 2005, 2006, 2012 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -34,9 +34,10 @@
 
 #define LOG_STRERROR(kind,syscall) GNUNET_log_from_strerror (kind, "util", syscall)
 
+
 /* TODO: ndurner, move this to plibc? */
 /* The code is derived from glibc, obviously */
-#if MINGW
+#if !HAVE_RANDOM || !HAVE_SRANDOM
 #ifdef RANDOM
 #undef RANDOM
 #endif
@@ -45,14 +46,22 @@
 #endif
 #define RANDOM() glibc_weak_rand32()
 #define SRANDOM(s) glibc_weak_srand32(s)
+#if defined(RAND_MAX)
+#undef RAND_MAX
+#endif
+#define RAND_MAX 0x7fffffff /* Hopefully this is correct */
+
+
 static int32_t glibc_weak_rand32_state = 1;
 
+
 void
 glibc_weak_srand32 (int32_t s)
 {
   glibc_weak_rand32_state = s;
 }
 
+
 int32_t
 glibc_weak_rand32 ()
 {
@@ -70,11 +79,12 @@ glibc_weak_rand32 ()
  * @return number between 0 and 1.
  */
 static double
-weak_random ()
+get_weak_random ()
 {
   return ((double) RANDOM () / RAND_MAX);
 }
 
+
 /**
  * Seed a weak random generator. Only GNUNET_CRYPTO_QUALITY_WEAK-mode generator
  * can be seeded.
@@ -87,6 +97,7 @@ GNUNET_CRYPTO_seed_weak_random (int32_t seed)
   SRANDOM (seed);
 }
 
+
 /**
  * Produce a random value.
  *
@@ -130,7 +141,7 @@ GNUNET_CRYPTO_random_u32 (enum GNUNET_CRYPTO_Quality mode, uint32_t i)
     while (ret >= ul);
     return ret % i;
   case GNUNET_CRYPTO_QUALITY_WEAK:
-    ret = i * weak_random ();
+    ret = i * get_weak_random ();
     if (ret >= i)
       ret = i - 1;
     return ret;
@@ -207,7 +218,7 @@ GNUNET_CRYPTO_random_u64 (enum GNUNET_CRYPTO_Quality mode, uint64_t max)
 
     return ret % max;
   case GNUNET_CRYPTO_QUALITY_WEAK:
-    ret = max * weak_random ();
+    ret = max * get_weak_random ();
     if (ret >= max)
       ret = max - 1;
     return ret;
@@ -217,17 +228,6 @@ GNUNET_CRYPTO_random_u64 (enum GNUNET_CRYPTO_Quality mode, uint64_t max)
   return 0;
 }
 
-/**
- * This function should only be called in testcases
- * where strong entropy gathering is not desired
- * (for example, for hostkey generation).
- */
-void
-GNUNET_CRYPTO_random_disable_entropy_gathering ()
-{
-  gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
-}
-
 
 /**
  * Process ID of the "find" process that we use for
@@ -235,6 +235,7 @@ GNUNET_CRYPTO_random_disable_entropy_gathering ()
  */
 static struct GNUNET_OS_Process *genproc;
 
+
 /**
  * Function called by libgcrypt whenever we are
  * blocked gathering entropy.
@@ -253,10 +254,10 @@ entropy_generator (void *cls, const char *what, int printchar, int current,
   {
     if (genproc != NULL)
     {
-      if (0 != GNUNET_OS_process_kill (genproc, SIGTERM))
+      if (0 != GNUNET_OS_process_kill (genproc, SIGKILL))
         LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "kill");
       GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (genproc));
-      GNUNET_OS_process_close (genproc);
+      GNUNET_OS_process_destroy (genproc);
       genproc = NULL;
     }
     return;
@@ -271,18 +272,19 @@ entropy_generator (void *cls, const char *what, int printchar, int current,
       GNUNET_break (0);
       return;
     }
-    if (0 != GNUNET_OS_process_kill (genproc, SIGTERM))
+    if (0 != GNUNET_OS_process_kill (genproc, SIGKILL))
       LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "kill");
     GNUNET_break (GNUNET_OK == GNUNET_OS_process_wait (genproc));
-    GNUNET_OS_process_close (genproc);
+    GNUNET_OS_process_destroy (genproc);
     genproc = NULL;
   }
   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, 0, 
+                             NULL, NULL, "sh", "sh", "-c",
+                             "exec find / -mount -type f -exec cp {} /dev/null \\; 2>/dev/null",
+                             NULL);
 }
 
 
@@ -292,23 +294,37 @@ killfind ()
   if (genproc != NULL)
   {
     GNUNET_OS_process_kill (genproc, SIGKILL);
-    GNUNET_OS_process_close (genproc);
+    GNUNET_OS_process_destroy (genproc);
     genproc = NULL;
   }
 }
 
 
-void __attribute__ ((constructor)) GNUNET_CRYPTO_random_init ()
+void __attribute__ ((constructor)) 
+GNUNET_CRYPTO_random_init ()
 {
-  gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
-  if (!gcry_check_version (GCRYPT_VERSION))
+  gcry_error_t rc;
+
+  if (! gcry_check_version (NEED_LIBGCRYPT_VERSION))
   {
     FPRINTF (stderr,
              _
              ("libgcrypt has not the expected version (version %s is required).\n"),
-             GCRYPT_VERSION);
+             NEED_LIBGCRYPT_VERSION);
     GNUNET_abort ();
   }
+  if ((rc = gcry_control (GCRYCTL_DISABLE_SECMEM, 0)))
+    FPRINTF (stderr, "Failed to set libgcrypt option %s: %s\n", "DISABLE_SECMEM",
+            gcry_strerror (rc));
+  /* we only generate ephemeral keys in-process; for those,
+     we are fine with "just" using GCRY_STRONG_RANDOM */
+  if ((rc = gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0)))
+    FPRINTF (stderr,  "Failed to set libgcrypt option %s: %s\n", "ENABLE_QUICK_RANDOM",
+            gcry_strerror (rc));
+  
+#ifdef GCRYCTL_INITIALIZATION_FINISHED
+  gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0);
+#endif
 #ifdef gcry_fast_random_poll
   gcry_fast_random_poll ();
 #endif
@@ -320,7 +336,8 @@ void __attribute__ ((constructor)) GNUNET_CRYPTO_random_init ()
 }
 
 
-void __attribute__ ((destructor)) GNUNET_CRYPTO_random_fini ()
+void __attribute__ ((destructor)) 
+GNUNET_CRYPTO_random_fini ()
 {
   gcry_set_progress_handler (NULL, NULL);
 }