From: Dr. David von Oheimb Date: Mon, 2 Jun 2025 19:00:49 +0000 (+0200) Subject: EVP_PKEY_CTX_get_params(): add error queue entry EVP_R_PROVIDER_GET_CTX_PARAMS_NOT_SU... X-Git-Tag: 4.0-PRE-CLANG-FORMAT-WEBKIT~526 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a9b7ea6de87374a9895697373e9368681399b86;p=thirdparty%2Fopenssl.git EVP_PKEY_CTX_get_params(): add error queue entry EVP_R_PROVIDER_GET_CTX_PARAMS_NOT_SUPPORTED Reviewed-by: Dmitry Belyavskiy Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/28473) --- diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt index 89036b05dca..e819a808ca9 100644 --- a/crypto/err/openssl.txt +++ b/crypto/err/openssl.txt @@ -808,6 +808,8 @@ EVP_R_PRIVATE_KEY_DECODE_ERROR:145:private key decode error EVP_R_PRIVATE_KEY_ENCODE_ERROR:146:private key encode error EVP_R_PROVIDER_ASYM_CIPHER_FAILURE:232:provider asym cipher failure EVP_R_PROVIDER_ASYM_CIPHER_NOT_SUPPORTED:235:provider asym cipher not supported +EVP_R_PROVIDER_GET_CTX_PARAMS_NOT_SUPPORTED:238:\ + provider get ctx params not supported EVP_R_PROVIDER_KEYMGMT_FAILURE:233:provider keymgmt failure EVP_R_PROVIDER_KEYMGMT_NOT_SUPPORTED:236:provider keymgmt not supported EVP_R_PROVIDER_SIGNATURE_FAILURE:234:provider signature failure diff --git a/crypto/evp/evp_err.c b/crypto/evp/evp_err.c index 028f8202c86..0511a124b80 100644 --- a/crypto/evp/evp_err.c +++ b/crypto/evp/evp_err.c @@ -155,6 +155,8 @@ static const ERR_STRING_DATA EVP_str_reasons[] = { "provider asym cipher failure"}, {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PROVIDER_ASYM_CIPHER_NOT_SUPPORTED), "provider asym cipher not supported"}, + {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PROVIDER_GET_CTX_PARAMS_NOT_SUPPORTED), + "provider get ctx params not supported"}, {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PROVIDER_KEYMGMT_FAILURE), "provider keymgmt failure"}, {ERR_PACK(ERR_LIB_EVP, 0, EVP_R_PROVIDER_KEYMGMT_NOT_SUPPORTED), diff --git a/crypto/evp/pmeth_lib.c b/crypto/evp/pmeth_lib.c index e2819bf8269..059469f0b0f 100644 --- a/crypto/evp/pmeth_lib.c +++ b/crypto/evp/pmeth_lib.c @@ -762,6 +762,8 @@ int EVP_PKEY_CTX_get_params(EVP_PKEY_CTX *ctx, OSSL_PARAM *params) return evp_pkey_ctx_get_params_to_ctrl(ctx, params); #endif } + ERR_raise_data(ERR_LIB_EVP, EVP_R_PROVIDER_GET_CTX_PARAMS_NOT_SUPPORTED, + "EVP_PKEY_OP=0x%x", ctx->operation); return 0; } diff --git a/include/openssl/evperr.h b/include/openssl/evperr.h index 6dc846a2844..87a67c0dea5 100644 --- a/include/openssl/evperr.h +++ b/include/openssl/evperr.h @@ -106,6 +106,7 @@ # define EVP_R_PRIVATE_KEY_ENCODE_ERROR 146 # define EVP_R_PROVIDER_ASYM_CIPHER_FAILURE 232 # define EVP_R_PROVIDER_ASYM_CIPHER_NOT_SUPPORTED 235 +# define EVP_R_PROVIDER_GET_CTX_PARAMS_NOT_SUPPORTED 238 # define EVP_R_PROVIDER_KEYMGMT_FAILURE 233 # define EVP_R_PROVIDER_KEYMGMT_NOT_SUPPORTED 236 # define EVP_R_PROVIDER_SIGNATURE_FAILURE 234