diff options
Diffstat (limited to 'random')
| -rw-r--r-- | random/random-csprng.c | 19 | ||||
| -rw-r--r-- | random/random.c | 1 | ||||
| -rw-r--r-- | random/rndhw.c | 1 | ||||
| -rw-r--r-- | random/rndw32.c | 5 |
4 files changed, 11 insertions, 15 deletions
diff --git a/random/random-csprng.c b/random/random-csprng.c index ef168056..eda34f76 100644 --- a/random/random-csprng.c +++ b/random/random-csprng.c @@ -29,7 +29,6 @@ #include <config.h> #include <stdio.h> #include <stdlib.h> -#include <assert.h> #include <errno.h> #include <string.h> #include <sys/time.h> @@ -278,9 +277,9 @@ initialize_basics(void) /* Make sure that we are still using the values we have traditionally used for the random levels. */ - assert ( GCRY_WEAK_RANDOM == 0 - && GCRY_STRONG_RANDOM == 1 - && GCRY_VERY_STRONG_RANDOM == 2); + gcry_assert (GCRY_WEAK_RANDOM == 0 + && GCRY_STRONG_RANDOM == 1 + && GCRY_VERY_STRONG_RANDOM == 2); } } @@ -603,7 +602,7 @@ mix_pool(unsigned char *pool) #error must have a digest length of 20 for ripe-md-160 #endif - assert (pool_is_locked); + gcry_assert (pool_is_locked); _gcry_rmd160_init( &md ); /* Loop over the pool. */ @@ -728,7 +727,7 @@ read_seed_file (void) unsigned char buffer[POOLSIZE]; int n; - assert (pool_is_locked); + gcry_assert (pool_is_locked); if (!seed_file_name) return 0; @@ -919,7 +918,7 @@ read_pool (byte *buffer, size_t length, int level) static volatile pid_t my_pid = (pid_t)(-1); volatile pid_t my_pid2; - assert (pool_is_locked); + gcry_assert (pool_is_locked); retry: /* Get our own pid, so that we can detect a fork. */ @@ -938,7 +937,7 @@ read_pool (byte *buffer, size_t length, int level) just_mixed = 0; /* Make sure it will get mixed. */ } - assert (pool_is_locked); + gcry_assert (pool_is_locked); /* Our code does not allow to extract more than POOLSIZE. Better check it here. */ @@ -1059,7 +1058,7 @@ add_randomness (const void *buffer, size_t length, enum random_origins origin) const unsigned char *p = buffer; size_t count = 0; - assert (pool_is_locked); + gcry_assert (pool_is_locked); rndstats.addbytes += length; rndstats.naddbytes++; @@ -1157,7 +1156,7 @@ getfnc_fast_random_poll (void))( void (*)(const void*, size_t, static void do_fast_random_poll (void) { - assert (pool_is_locked); + gcry_assert (pool_is_locked); rndstats.fastpolls++; diff --git a/random/random.c b/random/random.c index 020c6518..4402f44a 100644 --- a/random/random.c +++ b/random/random.c @@ -25,7 +25,6 @@ #include <config.h> #include <stdio.h> #include <stdlib.h> -#include <assert.h> #include <errno.h> #include "g10lib.h" diff --git a/random/rndhw.c b/random/rndhw.c index 577bd155..2c78b47c 100644 --- a/random/rndhw.c +++ b/random/rndhw.c @@ -20,7 +20,6 @@ #include <config.h> #include <stdio.h> #include <stdlib.h> -#include <assert.h> #include "types.h" #include "g10lib.h" diff --git a/random/rndw32.c b/random/rndw32.c index 74007e31..1952979d 100644 --- a/random/rndw32.c +++ b/random/rndw32.c @@ -71,7 +71,6 @@ #include <config.h> #include <stdio.h> #include <stdlib.h> -#include <assert.h> #include <errno.h> #include <string.h> #ifdef __GNUC__ @@ -735,7 +734,7 @@ slow_gatherer ( void (*add)(const void*, size_t, enum random_origins), (*add) (buffer, powerInfo[i].size, requester); no_results++; } - assert (i < 100); + gcry_assert (i < 100); } gcry_free (buffer); @@ -833,7 +832,7 @@ _gcry_rndw32_gather_random_fast (void (*add)(const void*, size_t, ADD ( GetQueueStatus (QS_ALLEVENTS)); ADD ( GetTickCount ()); - assert ( bufptr-buffer < sizeof (buffer) ); + gcry_assert ( bufptr-buffer < sizeof (buffer) ); (*add) ( buffer, bufptr-buffer, origin ); #undef ADD } |