From: Pauli Date: Sat, 10 Apr 2021 02:40:59 +0000 (+1000) Subject: Add additional KMAC error X-Git-Tag: openssl-3.0.0-alpha15~132 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3c2a55d470a313c2fc5f2fb625c086d0cb953ea;p=thirdparty%2Fopenssl.git Add additional KMAC error Reviewed-by: Shane Lontis (Merged from https://github.com/openssl/openssl/pull/14810) --- diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt index 07439f7c4ae..ee17b68405c 100644 --- a/crypto/err/openssl.txt +++ b/crypto/err/openssl.txt @@ -1006,6 +1006,7 @@ PROV_R_INVALID_X931_DIGEST:170:invalid x931 digest PROV_R_IN_ERROR_STATE:192:in error state PROV_R_KEY_SETUP_FAILED:101:key setup failed PROV_R_KEY_SIZE_TOO_SMALL:171:key size too small +PROV_R_LENGTH_TOO_LARGE:202:length too large PROV_R_MISSING_CEK_ALG:144:missing cek alg PROV_R_MISSING_CIPHER:155:missing cipher PROV_R_MISSING_CONFIG_DATA:213:missing config data diff --git a/include/openssl/proverr.h b/include/openssl/proverr.h index 99a937f1e36..c40815a03bb 100644 --- a/include/openssl/proverr.h +++ b/include/openssl/proverr.h @@ -79,6 +79,7 @@ # define PROV_R_IN_ERROR_STATE 192 # define PROV_R_KEY_SETUP_FAILED 101 # define PROV_R_KEY_SIZE_TOO_SMALL 171 +# define PROV_R_LENGTH_TOO_LARGE 202 # define PROV_R_MISSING_CEK_ALG 144 # define PROV_R_MISSING_CIPHER 155 # define PROV_R_MISSING_CONFIG_DATA 213 diff --git a/providers/common/provider_err.c b/providers/common/provider_err.c index 30574f4c6c3..dd1a98f9352 100644 --- a/providers/common/provider_err.c +++ b/providers/common/provider_err.c @@ -110,6 +110,7 @@ static const ERR_STRING_DATA PROV_str_reasons[] = { {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_KEY_SETUP_FAILED), "key setup failed"}, {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_KEY_SIZE_TOO_SMALL), "key size too small"}, + {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_LENGTH_TOO_LARGE), "length too large"}, {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_CEK_ALG), "missing cek alg"}, {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_CIPHER), "missing cipher"}, {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_CONFIG_DATA),