diff options
author | Pauli <paul.dale@oracle.com> | 2020-10-30 15:54:03 +1000 |
---|---|---|
committer | Pauli <paul.dale@oracle.com> | 2020-11-20 08:24:21 +1000 |
commit | 08edd447c97854d6548c15149de90d6bd3ddd47b (patch) | |
tree | 005070d7bc73f7e588741c01522fb2f500aa711e /crypto | |
parent | 0d4460d27ea2fef46f02fa94a60717e9d168ed96 (diff) |
prov: move the entropy source out of the FIPS provider
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/13226)
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/err/openssl.txt | 3 | ||||
-rw-r--r-- | crypto/rand/rand_err.c | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt index 690bd197cd..d8ea2a333f 100644 --- a/crypto/err/openssl.txt +++ b/crypto/err/openssl.txt @@ -2964,8 +2964,6 @@ PROV_R_TAG_NOT_NEEDED:120:tag not needed PROV_R_UNABLE_TO_FIND_CIPHERS:207:unable to find ciphers PROV_R_UNABLE_TO_GET_ENTROPY:202:unable to get entropy PROV_R_UNABLE_TO_GET_NONCE:203:unable to get nonce -PROV_R_UNABLE_TO_GET_PARENT_RESEED_PROP_COUNTER:198:\ - unable to get parent reseed prop counter PROV_R_UNABLE_TO_GET_PARENT_STRENGTH:199:unable to get parent strength PROV_R_UNABLE_TO_INITIALISE_CIPHERS:208:unable to initialise ciphers PROV_R_UNABLE_TO_LOAD_SHA1:143:unable to load sha1 @@ -3028,7 +3026,6 @@ RAND_R_UNABLE_TO_FETCH_DRBG:144:unable to fetch drbg RAND_R_UNABLE_TO_GET_PARENT_RESEED_PROP_COUNTER:141:\ unable to get parent reseed prop counter RAND_R_UNABLE_TO_GET_PARENT_STRENGTH:138:unable to get parent strength -RAND_R_UNABLE_TO_GET_RESEED_COUNTER :142:unable to get reseed counter RAND_R_UNABLE_TO_LOCK_PARENT:140:unable to lock parent RAND_R_UNSUPPORTED_DRBG_FLAGS:132:unsupported drbg flags RAND_R_UNSUPPORTED_DRBG_TYPE:120:unsupported drbg type diff --git a/crypto/rand/rand_err.c b/crypto/rand/rand_err.c index ecf7cb2e59..be8726192b 100644 --- a/crypto/rand/rand_err.c +++ b/crypto/rand/rand_err.c @@ -87,8 +87,6 @@ static const ERR_STRING_DATA RAND_str_reasons[] = { "unable to get parent reseed prop counter"}, {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNABLE_TO_GET_PARENT_STRENGTH), "unable to get parent strength"}, - {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNABLE_TO_GET_RESEED_COUNTER), - "unable to get reseed counter"}, {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNABLE_TO_LOCK_PARENT), "unable to lock parent"}, {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_UNSUPPORTED_DRBG_FLAGS), |