diff options
| author | simon <simon@FreeBSD.org> | 2007-03-15 20:03:30 +0000 |
|---|---|---|
| committer | simon <simon@FreeBSD.org> | 2007-03-15 20:03:30 +0000 |
| commit | ee48ceb6a84c702d0f80bc72ce8be558bdcb0de3 (patch) | |
| tree | e7ef8661c43c3081071230f45d641b5d8a756e55 /crypto/openssl/crypto/rand | |
| parent | 25dab5b4c1779c970f3c644ff3f37f0c4cb5538d (diff) | |
| download | FreeBSD-src-ee48ceb6a84c702d0f80bc72ce8be558bdcb0de3.zip FreeBSD-src-ee48ceb6a84c702d0f80bc72ce8be558bdcb0de3.tar.gz | |
Vendor import of OpenSSL 0.9.8e.
Diffstat (limited to 'crypto/openssl/crypto/rand')
| -rw-r--r-- | crypto/openssl/crypto/rand/md_rand.c | 2 | ||||
| -rw-r--r-- | crypto/openssl/crypto/rand/rand_err.c | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/crypto/openssl/crypto/rand/md_rand.c b/crypto/openssl/crypto/rand/md_rand.c index 6e10f6e..9783d0c 100644 --- a/crypto/openssl/crypto/rand/md_rand.c +++ b/crypto/openssl/crypto/rand/md_rand.c @@ -152,7 +152,7 @@ static unsigned long locking_thread = 0; /* valid iff crypto_lock_rand is set */ int rand_predictable=0; #endif -const char *RAND_version="RAND" OPENSSL_VERSION_PTEXT; +const char RAND_version[]="RAND" OPENSSL_VERSION_PTEXT; static void ssleay_rand_cleanup(void); static void ssleay_rand_seed(const void *buf, int num); diff --git a/crypto/openssl/crypto/rand/rand_err.c b/crypto/openssl/crypto/rand/rand_err.c index b2f2448..386934d 100644 --- a/crypto/openssl/crypto/rand/rand_err.c +++ b/crypto/openssl/crypto/rand/rand_err.c @@ -85,15 +85,12 @@ static ERR_STRING_DATA RAND_str_reasons[]= void ERR_load_RAND_strings(void) { - static int init=1; +#ifndef OPENSSL_NO_ERR - if (init) + if (ERR_func_error_string(RAND_str_functs[0].error) == NULL) { - init=0; -#ifndef OPENSSL_NO_ERR ERR_load_strings(0,RAND_str_functs); ERR_load_strings(0,RAND_str_reasons); -#endif - } +#endif } |
