[GNUnet-SVN] r6183 - in GNUnet: . src/applications/testing src/include src/util/boot src/util/crypto

[gnunet]

Author: grothoff
Date: 2008-02-06 23:33:05 -0700 (Wed, 06 Feb 2008)
New Revision: 6183

Modified:
   GNUnet/src/applications/testing/gnunet-testing.conf
   GNUnet/src/include/gnunet_util_crypto.h
   GNUnet/src/util/boot/startup.c
   GNUnet/src/util/crypto/hostkeytest.c
   GNUnet/src/util/crypto/locking_gcrypt.c
   GNUnet/src/util/crypto/random.c
   GNUnet/src/util/crypto/symciphertest.c
   GNUnet/src/util/crypto/weakkeytest.c
   GNUnet/todo
Log:
done

Modified: GNUnet/src/applications/testing/gnunet-testing.conf
===================================================================
--- GNUnet/src/applications/testing/gnunet-testing.conf 2008-02-07 06:02:55 UTC 
(rev 6182)
+++ GNUnet/src/applications/testing/gnunet-testing.conf 2008-02-07 06:33:05 UTC 
(rev 6183)
@@ -1,6 +1,5 @@
 # This is the configuration template for the GNUnet daemon when running
-# testcases (via make check).  This file is not used during
-* normal operation.
+# testcases (via make check).  This file is not used during normal operation.
 [PATHS]
 GNUNETD_HOME     = /tmp/FIXME
 

Modified: GNUnet/src/include/gnunet_util_crypto.h
===================================================================
--- GNUnet/src/include/gnunet_util_crypto.h     2008-02-07 06:02:55 UTC (rev 
6182)
+++ GNUnet/src/include/gnunet_util_crypto.h     2008-02-07 06:33:05 UTC (rev 
6183)
@@ -423,6 +423,14 @@
                        const GNUNET_RSA_Signature * sig,
                        const GNUNET_RSA_PublicKey * publicKey);
 
+
+/**
+ * This function should only be called in testcases
+ * where strong entropy gathering is not desired
+ * (for example, for hostkey generation).
+ */
+void GNUNET_disable_entropy_gathering(void);
+
 #if 0                           /* keep Emacsens' auto-indent happy */
 {
 #endif

Modified: GNUnet/src/util/boot/startup.c
===================================================================
--- GNUnet/src/util/boot/startup.c      2008-02-07 06:02:55 UTC (rev 6182)
+++ GNUnet/src/util/boot/startup.c      2008-02-07 06:33:05 UTC (rev 6183)
@@ -277,10 +277,8 @@
       (GNUNET_YES == GNUNET_GC_get_configuration_value_yesno (*cfg,
                                                               "TESTING",
                                                               "WEAKRANDOM",
-                                                              GNUNET_NO)))
-    {
-      gcry_control (GCRYCTL_ENABLE_QUICK_RANDOM, 0);
-    }
+                                                              GNUNET_NO)))    
+      GNUNET_disable_entropy_gathering();    
   if (configure_logging (ectx, *cfg) != 0)
     return -1;
   return i;

Modified: GNUnet/src/util/crypto/hostkeytest.c
===================================================================
--- GNUnet/src/util/crypto/hostkeytest.c        2008-02-07 06:02:55 UTC (rev 
6182)
+++ GNUnet/src/util/crypto/hostkeytest.c        2008-02-07 06:33:05 UTC (rev 
6183)
@@ -315,6 +315,7 @@
 {
   int failureCount = 0;
 
+  GNUNET_disable_entropy_gathering();
 #if PERF
   if (GNUNET_OK != testEncryptPerformance ())
     failureCount++;

Modified: GNUnet/src/util/crypto/locking_gcrypt.c
===================================================================
--- GNUnet/src/util/crypto/locking_gcrypt.c     2008-02-07 06:02:55 UTC (rev 
6182)
+++ GNUnet/src/util/crypto/locking_gcrypt.c     2008-02-07 06:33:05 UTC (rev 
6183)
@@ -90,6 +90,17 @@
 #endif
 }
 
+/**
+ * This function should only be called in testcases
+ * where strong entropy gathering is not desired
+ * (for example, for hostkey generation).
+ */
+void GNUNET_disable_entropy_gathering()
+{
+  gcry_control(GCRYCTL_ENABLE_QUICK_RANDOM, 0);
+}
+
+
 void __attribute__ ((destructor)) GNUNET_crypto_ltdl_fini ()
 {
 #if USE_LOCK

Modified: GNUnet/src/util/crypto/random.c
===================================================================
--- GNUnet/src/util/crypto/random.c     2008-02-07 06:02:55 UTC (rev 6182)
+++ GNUnet/src/util/crypto/random.c     2008-02-07 06:33:05 UTC (rev 6183)
@@ -72,7 +72,8 @@
 /**
  * Get an array with a random permutation of the
  * numbers 0...n-1.
- * @param mode GNUNET_RANDOM_QUALITY_STRONG if the strong (but expensive) PRNG 
should be used, GNUNET_RANDOM_QUALITY_WEAK otherwise
+ * @param mode GNUNET_RANDOM_QUALITY_STRONG if the strong (but expensive)
+ *        PRNG should be used, GNUNET_RANDOM_QUALITY_WEAK otherwise
  * @param n the size of the array
  * @return the permutation array (allocated from heap)
  */

Modified: GNUnet/src/util/crypto/symciphertest.c
===================================================================
--- GNUnet/src/util/crypto/symciphertest.c      2008-02-07 06:02:55 UTC (rev 
6182)
+++ GNUnet/src/util/crypto/symciphertest.c      2008-02-07 06:33:05 UTC (rev 
6183)
@@ -158,6 +158,7 @@
 {
   int failureCount = 0;
 
+  GNUNET_disable_entropy_gathering();
   GNUNET_GE_ASSERT (NULL,
                     strlen (INITVALUE) >
                     sizeof (GNUNET_AES_InitializationVector));

Modified: GNUnet/src/util/crypto/weakkeytest.c
===================================================================
--- GNUnet/src/util/crypto/weakkeytest.c        2008-02-07 06:02:55 UTC (rev 
6182)
+++ GNUnet/src/util/crypto/weakkeytest.c        2008-02-07 06:33:05 UTC (rev 
6183)
@@ -175,6 +175,7 @@
 {
   int weak_keys;
 
+  GNUNET_disable_entropy_gathering();
   if (GENERATE_WEAK_KEYS)
     {
       weak_keys = getWeakKeys ();

Modified: GNUnet/todo
===================================================================
--- GNUnet/todo 2008-02-07 06:02:55 UTC (rev 6182)
+++ GNUnet/todo 2008-02-07 06:33:05 UTC (rev 6183)
@@ -3,26 +3,25 @@
 Annotations:
   RC == Release Critical
 
-0.8.0 [2'08] (aka "advanced features"):
+0.7.4 [4'08] (aka "fix search"):
 - modify datastore to return diverse subsets of large response sets,
   except when processing for loopback!
 - make sure core polls whenever outbound bandwidth is available
-- gnunet-chat [ RC ]
 - Insert/Index a "shared directory" automatically [Nils]
   See also: https://gnunet.org/drupal/?q=node/97 [RC]
-  Furthermore: blake suggested indexing a document only after
+  Furthermore: Blake suggested indexing a document only after
   a keyword of the document has been requested (so we would 
   add a special block to the datastore and then trigger
   gnunet-insert only if the file is actually needed!)
+
+0.8.0 [6'08] (aka "advanced features"):
+- gnunet-chat [ RC ]
 - power insert [#854]
 - RPC API and testcase
-- switch libgcrypt to not use entropy during testcases
 
 
 1.0.0 (aka "userfriendly"):
-- implement testbed for profiling
 
-
 Small extensions (that could be done any time):
 - insert meta-data under hash (md5? sha1? sha-512? GNUnet-URI?)
   as keyword (to allow getting meta-data from URI only) [RC]