[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r18288 - in gnunet/src: include util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r18288 - in gnunet/src: include util |
Date: |
Wed, 23 Nov 2011 21:03:58 +0100 |
Author: grothoff
Date: 2011-11-23 21:03:58 +0100 (Wed, 23 Nov 2011)
New Revision: 18288
Modified:
gnunet/src/include/gnunet_crypto_lib.h
gnunet/src/util/crypto_random.c
gnunet/src/util/test_container_bloomfilter.c
Log:
LRN: Fix the use of SRANDOM
Modified: gnunet/src/include/gnunet_crypto_lib.h
===================================================================
--- gnunet/src/include/gnunet_crypto_lib.h 2011-11-23 19:38:40 UTC (rev
18287)
+++ gnunet/src/include/gnunet_crypto_lib.h 2011-11-23 20:03:58 UTC (rev
18288)
@@ -222,6 +222,14 @@
/* **************** Functions and Macros ************* */
+/**
+ * Seed a weak random generator. Only GNUNET_CRYPTO_QUALITY_WEAK-mode generator
+ * can be seeded.
+ *
+ * @param seed the seed to use
+ */
+void
+GNUNET_CRYPTO_seed_weak_random (int32_t seed);
/**
* Compute the CRC32 checksum for the first len
Modified: gnunet/src/util/crypto_random.c
===================================================================
--- gnunet/src/util/crypto_random.c 2011-11-23 19:38:40 UTC (rev 18287)
+++ gnunet/src/util/crypto_random.c 2011-11-23 20:03:58 UTC (rev 18288)
@@ -74,6 +74,17 @@
return ((double) RANDOM () / RAND_MAX);
}
+/**
+ * Seed a weak random generator. Only GNUNET_CRYPTO_QUALITY_WEAK-mode generator
+ * can be seeded.
+ *
+ * @param seed the seed to use
+ */
+void
+GNUNET_CRYPTO_seed_weak_random (int32_t seed)
+{
+ SRANDOM (seed);
+}
/**
* Produce a random value.
@@ -302,8 +313,8 @@
#endif
gcry_set_progress_handler (&entropy_generator, NULL);
atexit (&killfind);
- SRANDOM (time (NULL) ^
- GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX));
+ GNUNET_CRYPTO_seed_weak_random (time (NULL) ^
+ GNUNET_CRYPTO_random_u32 (GNUNET_CRYPTO_QUALITY_NONCE, UINT32_MAX));
}
Modified: gnunet/src/util/test_container_bloomfilter.c
===================================================================
--- gnunet/src/util/test_container_bloomfilter.c 2011-11-23 19:38:40 UTC
(rev 18287)
+++ gnunet/src/util/test_container_bloomfilter.c 2011-11-23 20:03:58 UTC
(rev 18288)
@@ -68,7 +68,7 @@
struct stat sbuf;
GNUNET_log_setup ("test-container-bloomfilter", "WARNING", NULL);
- SRANDOM (1);
+ GNUNET_CRYPTO_seed_weak_random (1);
if (0 == stat (TESTFILE, &sbuf))
if (0 != UNLINK (TESTFILE))
GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "unlink", TESTFILE);
@@ -79,7 +79,7 @@
nextHC (&tmp);
GNUNET_CONTAINER_bloomfilter_add (bf, &tmp);
}
- SRANDOM (1);
+ GNUNET_CRYPTO_seed_weak_random (1);
ok1 = 0;
for (i = 0; i < 200; i++)
{
@@ -106,7 +106,7 @@
bfi = GNUNET_CONTAINER_bloomfilter_init (buf, SIZE, K);
GNUNET_assert (bfi != NULL);
- SRANDOM (1);
+ GNUNET_CRYPTO_seed_weak_random (1);
ok1 = 0;
ok2 = 0;
for (i = 0; i < 200; i++)
@@ -134,7 +134,7 @@
return -1;
}
- SRANDOM (1);
+ GNUNET_CRYPTO_seed_weak_random (1);
for (i = 0; i < 100; i++)
{
nextHC (&tmp);
@@ -142,7 +142,7 @@
GNUNET_CONTAINER_bloomfilter_remove (bfi, &tmp);
}
- SRANDOM (1);
+ GNUNET_CRYPTO_seed_weak_random (1);
ok1 = 0;
ok2 = 0;
@@ -174,7 +174,7 @@
return -1;
}
- SRANDOM (3);
+ GNUNET_CRYPTO_seed_weak_random (3);
GNUNET_CONTAINER_bloomfilter_clear (bf);
falseok = 0;
@@ -198,14 +198,14 @@
return -1;
}
- SRANDOM (2);
+ GNUNET_CRYPTO_seed_weak_random (2);
i = 20;
GNUNET_CONTAINER_bloomfilter_resize (bfi, &add_iterator, &i, SIZE * 2, K);
- SRANDOM (2);
+ GNUNET_CRYPTO_seed_weak_random (2);
i = 20;
GNUNET_CONTAINER_bloomfilter_resize (bf, &add_iterator, &i, SIZE * 2, K);
- SRANDOM (2);
+ GNUNET_CRYPTO_seed_weak_random (2);
ok1 = 0;
ok2 = 0;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r18288 - in gnunet/src: include util,
gnunet <=