From: Pauli Date: Wed, 21 Aug 2019 08:53:07 +0000 (+1000) Subject: KDF provider conversion error updates - generated X-Git-Tag: openssl-3.0.0-alpha1~1481 X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fopenssl.git;a=commitdiff_plain;h=f05b53a36821e8d34c094e0435e1625f32ae7102 KDF provider conversion error updates - generated Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/9662) --- diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt index 9b682d5084..6bf5fcdb9d 100644 --- a/crypto/err/openssl.txt +++ b/crypto/err/openssl.txt @@ -827,6 +827,7 @@ EVP_F_EVP_ENCRYPTFINAL_EX:127:EVP_EncryptFinal_ex EVP_F_EVP_ENCRYPTUPDATE:167:EVP_EncryptUpdate EVP_F_EVP_KDF_CTRL:224:EVP_KDF_ctrl EVP_F_EVP_KDF_CTRL_STR:225:EVP_KDF_ctrl_str +EVP_F_EVP_KDF_CTX_DUP:220: EVP_F_EVP_KDF_CTX_NEW:240:EVP_KDF_CTX_new EVP_F_EVP_KDF_CTX_NEW_ID:226:EVP_KDF_CTX_new_id EVP_F_EVP_KEYEXCH_FETCH:245:EVP_KEYEXCH_fetch @@ -2522,11 +2523,14 @@ EVP_R_XTS_DATA_UNIT_IS_TOO_LARGE:191:xts data unit is too large EVP_R_XTS_DUPLICATED_KEYS:192:xts duplicated keys KDF_R_BAD_ENCODING:122:bad encoding KDF_R_BAD_LENGTH:123:bad length +KDF_R_BOTH_MODE_AND_MODE_INT:127:both mode and mode int KDF_R_INAVLID_UKM_LEN:124:inavlid ukm len KDF_R_INVALID_DIGEST:100:invalid digest KDF_R_INVALID_ITERATION_COUNT:119:invalid iteration count KDF_R_INVALID_KEY_LEN:120:invalid key len KDF_R_INVALID_MAC_TYPE:116:invalid mac type +KDF_R_INVALID_MODE:128:invalid mode +KDF_R_INVALID_MODE_INT:129:invalid mode int KDF_R_INVALID_SALT_LEN:121:invalid salt len KDF_R_MISSING_CEK_ALG:125:missing cek alg KDF_R_MISSING_ITERATION_COUNT:109:missing iteration count diff --git a/crypto/kdf/kdf_err.c b/crypto/kdf/kdf_err.c index d7d4b1e707..b47d4dd760 100644 --- a/crypto/kdf/kdf_err.c +++ b/crypto/kdf/kdf_err.c @@ -16,12 +16,16 @@ 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), diff --git a/include/openssl/evperr.h b/include/openssl/evperr.h index 714f170bd9..4a29c4b827 100644 --- a/include/openssl/evperr.h +++ b/include/openssl/evperr.h @@ -67,6 +67,7 @@ int ERR_load_EVP_strings(void); # define EVP_F_EVP_ENCRYPTUPDATE 0 # define EVP_F_EVP_KDF_CTRL 0 # define EVP_F_EVP_KDF_CTRL_STR 0 +# define EVP_F_EVP_KDF_CTX_DUP 0 # define EVP_F_EVP_KDF_CTX_NEW 0 # define EVP_F_EVP_KDF_CTX_NEW_ID 0 # define EVP_F_EVP_KEYEXCH_FETCH 0 diff --git a/include/openssl/kdferr.h b/include/openssl/kdferr.h index d28640040c..41ca5c8443 100644 --- a/include/openssl/kdferr.h +++ b/include/openssl/kdferr.h @@ -78,11 +78,14 @@ int ERR_load_KDF_strings(void); */ # 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