EVP_PKEY_CTX_get_params(): add error queue entry EVP_R_PROVIDER_GET_CTX_PARAMS_NOT_SU...

Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28473)

diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt
index 89036b05dca9e32cbc5737d84b41b4d06f50cfdc..e819a808ca98e68e958daf7d7d38855fe0db27b4 100644 (file)
--- 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 028f8202c867f59065c81429c99acca3fef41b8d..0511a124b80824b921eb5c7dad4d771b3a9db2e7 100644 (file)
--- 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 e2819bf82699136bd4577655d2832c1b5f0887a3..059469f0b0f766159f1587910f197d34e4c405c5 100644 (file)
--- 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 6dc846a284456b337962b4d357988746c830811c..87a67c0dea55ce3a396ac01020cfafe7ae56cb06 100644 (file)
--- 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