diff options
| author | Rich Salz <rsalz@openssl.org> | 2017-07-26 14:27:30 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-07-26 19:27:54 -0400 |
| commit | 9f08a1c63efa2205aca4361a830ac04407325597 (patch) | |
| tree | a3ab9a036edf961cb6b09e5ed7f82919e6b456d5 /crypto | |
| parent | 43405889f47648ee70c1b412b8b71570e8aaa24a (diff) | |
Install custom RAND_METHOD for fuzzing
Instead of setting a "magic" global variable to force RAND to keep
consistent state and always generate the same bytestream, have
the fuzzing code install its own RAND_METHOD that does this. For
BN_RAND_DEBUG, we just don't do it; that debugging was about mucking
with BN's internal representation, not requiring predictable rand
bytes.
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/4025)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/rand/ossl_rand.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/crypto/rand/ossl_rand.c b/crypto/rand/ossl_rand.c index 119c2b423a..063b55b4f1 100644 --- a/crypto/rand/ossl_rand.c +++ b/crypto/rand/ossl_rand.c @@ -27,10 +27,6 @@ #include <internal/thread_once.h> #include "rand_lcl.h" -#if defined(BN_DEBUG) || defined(FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION) -# define PREDICT 1 -#endif - #define STATE_SIZE 1023 typedef struct ossl_rand_state_st OSSL_RAND_STATE; @@ -59,10 +55,6 @@ static unsigned int crypto_lock_rand = 0; */ static CRYPTO_THREAD_ID locking_threadid; -#ifdef PREDICT -int rand_predictable = 0; -#endif - static int rand_hw_seed(EVP_MD_CTX *ctx); static void rand_thread_cleanup(void *arg) @@ -112,11 +104,6 @@ static int rand_add(const void *buf, int num, double add) if (!num) return 1; -#ifdef PREDICT - if (rand_predictable) - return 1; -#endif - /* * (Based on the rand(3) manpage) * @@ -297,16 +284,6 @@ static int rand_bytes(unsigned char *buf, int num) gettimeofday(&tv, NULL); #endif -#ifdef PREDICT - if (rand_predictable) { - unsigned char val = 1; - - for (i = 0; i < num; i++) - buf[i] = val++; - return (1); - } -#endif - if (num <= 0) return 1; |