From: Pauli Date: Fri, 16 Jul 2021 01:52:30 +0000 (+1000) Subject: err: remove the derivation function is mandatory for FIPS error message since it... X-Git-Tag: openssl-3.0.0-beta2~41 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4e6fa8014f397d33ee87cab20b791648f76ffe1e;p=thirdparty%2Fopenssl.git err: remove the derivation function is mandatory for FIPS error message since it's no longer used and newly introduced Reviewed-by: Shane Lontis (Merged from https://github.com/openssl/openssl/pull/16096) --- diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt index 05005a8eaf6..da3fee84d16 100644 --- a/crypto/err/openssl.txt +++ b/crypto/err/openssl.txt @@ -1084,8 +1084,6 @@ RAND_R_ADDITIONAL_INPUT_TOO_LONG:102:additional input too long RAND_R_ALREADY_INSTANTIATED:103:already instantiated RAND_R_ARGUMENT_OUT_OF_RANGE:105:argument out of range RAND_R_CANNOT_OPEN_FILE:121:Cannot open file -RAND_R_DERIVATION_FUNCTION_MANDATORY_FOR_FIPS:137:\ - derivation function mandatory for fips RAND_R_DRBG_ALREADY_INITIALIZED:129:drbg already initialized RAND_R_DRBG_NOT_INITIALISED:104:drbg not initialised RAND_R_ENTROPY_INPUT_TOO_LONG:106:entropy input too long diff --git a/crypto/rand/rand_err.c b/crypto/rand/rand_err.c index f01773d8718..b9c2bf1760f 100644 --- a/crypto/rand/rand_err.c +++ b/crypto/rand/rand_err.c @@ -22,8 +22,6 @@ static const ERR_STRING_DATA RAND_str_reasons[] = { {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_ARGUMENT_OUT_OF_RANGE), "argument out of range"}, {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_CANNOT_OPEN_FILE), "Cannot open file"}, - {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_DERIVATION_FUNCTION_MANDATORY_FOR_FIPS), - "derivation function mandatory for fips"}, {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_DRBG_ALREADY_INITIALIZED), "drbg already initialized"}, {ERR_PACK(ERR_LIB_RAND, 0, RAND_R_DRBG_NOT_INITIALISED), diff --git a/include/openssl/randerr.h b/include/openssl/randerr.h index 3756ad17a85..b5e08e4362d 100644 --- a/include/openssl/randerr.h +++ b/include/openssl/randerr.h @@ -25,7 +25,6 @@ # define RAND_R_ALREADY_INSTANTIATED 103 # define RAND_R_ARGUMENT_OUT_OF_RANGE 105 # define RAND_R_CANNOT_OPEN_FILE 121 -# define RAND_R_DERIVATION_FUNCTION_MANDATORY_FOR_FIPS 137 # define RAND_R_DRBG_ALREADY_INITIALIZED 129 # define RAND_R_DRBG_NOT_INITIALISED 104 # define RAND_R_ENTROPY_INPUT_TOO_LONG 106