From 905b097fd586ed0279aee05b5961224212014ec9 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Sun, 10 Nov 2019 13:06:48 +0100 Subject: [PATCH] Deprecate ERR_load_KDF_strings() Not only deprecate, but also remove the reason strings and make ERR_load_KDF_strings() do nothing. Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/10368) --- crypto/kdf/kdf_err.c | 50 ------------------------------- include/openssl/kdferr.h | 64 +++++++++++++++++++++------------------- util/libcrypto.num | 2 +- util/missingcrypto.txt | 1 + 4 files changed, 35 insertions(+), 82 deletions(-) diff --git a/crypto/kdf/kdf_err.c b/crypto/kdf/kdf_err.c index 4c3f671637..5b794285e4 100644 --- a/crypto/kdf/kdf_err.c +++ b/crypto/kdf/kdf_err.c @@ -12,58 +12,8 @@ #include #ifndef OPENSSL_NO_DEPRECATED_3_0 -# ifndef OPENSSL_NO_ERR - -static const ERR_STRING_DATA KDF_str_reasons[] = { - {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_BAD_ENCODING), "bad encoding"}, - {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_BAD_LENGTH), "bad length"}, - {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_BOTH_MODE_AND_MODE_INT), - "both mode and mode int"}, - {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_INAVLID_UKM_LEN), "inavlid ukm len"}, - {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_INVALID_DIGEST), "invalid digest"}, - {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_INVALID_ITERATION_COUNT), - "invalid iteration count"}, - {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_INVALID_KEY_LEN), "invalid key len"}, - {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_INVALID_MAC_TYPE), "invalid mac type"}, - {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_INVALID_MODE), "invalid mode"}, - {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_INVALID_MODE_INT), "invalid mode int"}, - {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_INVALID_SALT_LEN), "invalid salt len"}, - {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_MISSING_CEK_ALG), "missing cek alg"}, - {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_MISSING_ITERATION_COUNT), - "missing iteration count"}, - {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_MISSING_KEY), "missing key"}, - {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_MISSING_MESSAGE_DIGEST), - "missing message digest"}, - {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_MISSING_PARAMETER), "missing parameter"}, - {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_MISSING_PASS), "missing pass"}, - {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_MISSING_SALT), "missing salt"}, - {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_MISSING_SECRET), "missing secret"}, - {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_MISSING_SEED), "missing seed"}, - {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_MISSING_SESSION_ID), "missing session id"}, - {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_MISSING_TYPE), "missing type"}, - {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_MISSING_XCGHASH), "missing xcghash"}, - {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_NOT_SUPPORTED), "not supported"}, - {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_UNKNOWN_PARAMETER_TYPE), - "unknown parameter type"}, - {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_UNSUPPORTED_CEK_ALG), - "unsupported cek alg"}, - {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_UNSUPPORTED_MAC_TYPE), - "unsupported mac type"}, - {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_VALUE_ERROR), "value error"}, - {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_VALUE_MISSING), "value missing"}, - {ERR_PACK(ERR_LIB_KDF, 0, KDF_R_WRONG_OUTPUT_BUFFER_SIZE), - "wrong output buffer size"}, - {0, NULL} -}; - -# endif - int ERR_load_KDF_strings(void) { -# ifndef OPENSSL_NO_ERR - if (ERR_reason_error_string(KDF_str_reasons[0].error) == NULL) - ERR_load_strings_const(KDF_str_reasons); -# endif return 1; } #endif diff --git a/include/openssl/kdferr.h b/include/openssl/kdferr.h index a0c6287c1c..31f112c741 100644 --- a/include/openssl/kdferr.h +++ b/include/openssl/kdferr.h @@ -24,7 +24,7 @@ # ifdef __cplusplus extern "C" # endif -int ERR_load_KDF_strings(void); +DEPRECATEDIN_3_0(int ERR_load_KDF_strings(void)) /* * KDF function codes. @@ -82,35 +82,37 @@ int ERR_load_KDF_strings(void); /* * KDF reason codes. */ -# define KDF_R_BAD_ENCODING 122 -# define KDF_R_BAD_LENGTH 123 -# define KDF_R_BOTH_MODE_AND_MODE_INT 127 -# define KDF_R_INAVLID_UKM_LEN 124 -# define KDF_R_INVALID_DIGEST 100 -# define KDF_R_INVALID_ITERATION_COUNT 119 -# define KDF_R_INVALID_KEY_LEN 120 -# define KDF_R_INVALID_MAC_TYPE 116 -# define KDF_R_INVALID_MODE 128 -# define KDF_R_INVALID_MODE_INT 129 -# define KDF_R_INVALID_SALT_LEN 121 -# define KDF_R_MISSING_CEK_ALG 125 -# define KDF_R_MISSING_ITERATION_COUNT 109 -# define KDF_R_MISSING_KEY 104 -# define KDF_R_MISSING_MESSAGE_DIGEST 105 -# define KDF_R_MISSING_PARAMETER 101 -# define KDF_R_MISSING_PASS 110 -# define KDF_R_MISSING_SALT 111 -# define KDF_R_MISSING_SECRET 107 -# define KDF_R_MISSING_SEED 106 -# define KDF_R_MISSING_SESSION_ID 113 -# define KDF_R_MISSING_TYPE 114 -# define KDF_R_MISSING_XCGHASH 115 -# define KDF_R_NOT_SUPPORTED 118 -# define KDF_R_UNKNOWN_PARAMETER_TYPE 103 -# define KDF_R_UNSUPPORTED_CEK_ALG 126 -# define KDF_R_UNSUPPORTED_MAC_TYPE 117 -# define KDF_R_VALUE_ERROR 108 -# define KDF_R_VALUE_MISSING 102 -# define KDF_R_WRONG_OUTPUT_BUFFER_SIZE 112 +# ifndef OPENSSL_NO_DEPRECATED_3_0 +# define KDF_R_BAD_ENCODING 122 +# define KDF_R_BAD_LENGTH 123 +# define KDF_R_BOTH_MODE_AND_MODE_INT 127 +# define KDF_R_INAVLID_UKM_LEN 124 +# define KDF_R_INVALID_DIGEST 100 +# define KDF_R_INVALID_ITERATION_COUNT 119 +# define KDF_R_INVALID_KEY_LEN 120 +# define KDF_R_INVALID_MAC_TYPE 116 +# define KDF_R_INVALID_MODE 128 +# define KDF_R_INVALID_MODE_INT 129 +# define KDF_R_INVALID_SALT_LEN 121 +# define KDF_R_MISSING_CEK_ALG 125 +# define KDF_R_MISSING_ITERATION_COUNT 109 +# define KDF_R_MISSING_KEY 104 +# define KDF_R_MISSING_MESSAGE_DIGEST 105 +# define KDF_R_MISSING_PARAMETER 101 +# define KDF_R_MISSING_PASS 110 +# define KDF_R_MISSING_SALT 111 +# define KDF_R_MISSING_SECRET 107 +# define KDF_R_MISSING_SEED 106 +# define KDF_R_MISSING_SESSION_ID 113 +# define KDF_R_MISSING_TYPE 114 +# define KDF_R_MISSING_XCGHASH 115 +# define KDF_R_NOT_SUPPORTED 118 +# define KDF_R_UNKNOWN_PARAMETER_TYPE 103 +# define KDF_R_UNSUPPORTED_CEK_ALG 126 +# define KDF_R_UNSUPPORTED_MAC_TYPE 117 +# define KDF_R_VALUE_ERROR 108 +# define KDF_R_VALUE_MISSING 102 +# define KDF_R_WRONG_OUTPUT_BUFFER_SIZE 112 +# endif #endif diff --git a/util/libcrypto.num b/util/libcrypto.num index 8238d754a2..2be8f118d0 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -1807,7 +1807,7 @@ i2d_ASN1_bio_stream 1849 3_0_0 EXIST::FUNCTION: CRYPTO_THREAD_init_local 1850 3_0_0 EXIST::FUNCTION: TS_RESP_CTX_set_serial_cb 1851 3_0_0 EXIST::FUNCTION:TS POLICY_MAPPING_it 1852 3_0_0 EXIST::FUNCTION: -ERR_load_KDF_strings 1853 3_0_0 EXIST::FUNCTION: +ERR_load_KDF_strings 1853 3_0_0 EXIST::FUNCTION:DEPRECATEDIN_3_0 UI_method_set_reader 1854 3_0_0 EXIST::FUNCTION: BIO_next 1855 3_0_0 EXIST::FUNCTION: ASN1_STRING_set_default_mask_asc 1856 3_0_0 EXIST::FUNCTION: diff --git a/util/missingcrypto.txt b/util/missingcrypto.txt index 408e6ffc63..32018fc9e6 100644 --- a/util/missingcrypto.txt +++ b/util/missingcrypto.txt @@ -446,6 +446,7 @@ ERR_load_ENGINE_strings ERR_load_ERR_strings ERR_load_ESS_strings ERR_load_EVP_strings +ERR_load_KDF_strings ERR_load_OBJ_strings ERR_load_OCSP_strings ERR_load_OSSL_STORE_strings -- 2.25.1