Change existing evp_test KeyGen Ctrls to use provider algorithm

parameter names.

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Paul Dale <ppzgs1@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/25008)

diff --git a/test/evp_test.c b/test/evp_test.c
index b947eb8f9c6967d8a59798236894f65bef5d9c94..5e6959176718819bcc5190f2999e0dc4444a6e54 100644 (file)
--- a/test/evp_test.c
+++ b/test/evp_test.c
@@ -3931,7 +3931,6 @@ static void keygen_test_cleanup(EVP_TEST *t)
     OPENSSL_free(keygen->alg);
     OPENSSL_free(keygen->keyname);
     OPENSSL_free(keygen->paramname);
-    OPENSSL_free(keygen->alg);
     OPENSSL_free(t->data);
     t->data = NULL;
 }
@@ -3955,7 +3954,7 @@ static int keygen_test_run(EVP_TEST *t)
     KEYGEN_TEST_DATA *keygen = t->data;
     EVP_PKEY *pkey = NULL, *keyparams = NULL;
     EVP_PKEY_CTX *genctx = NULL; /* Keygen context to use */
-    int rv = 1, i;
+    int rv = 1;
     OSSL_PARAM params[4];
     size_t params_n = 0;
 

diff --git a/test/recipes/30-test_evp_data/evppkey_ffdhe.txt b/test/recipes/30-test_evp_data/evppkey_ffdhe.txt
index 2e17571e9e5a565e738baf1155361feb4948d967..f6f367aa5bca5c06961c6ac72a01a6d69cd6a397 100644 (file)
--- a/test/recipes/30-test_evp_data/evppkey_ffdhe.txt
+++ b/test/recipes/30-test_evp_data/evppkey_ffdhe.txt
@@ -16,7 +16,7 @@ Title = RFC7919 DH tests
 
 # Key generation test
 KeyGen = dhKeyAgreement
-Ctrl = dh_param:ffdhe2048
+Ctrl = group:ffdhe2048
 KeyName = tmpdh
 
 # ffdhe2048-1 and ffdhe2048-2 were randomly generated and have a shared secret

diff --git a/test/recipes/30-test_evp_data/evppkey_rsa.txt b/test/recipes/30-test_evp_data/evppkey_rsa.txt
index 4e6d6af220f5347d7f2928a57d3ca6fe9362c4e2..dc5f2138c3ed6b0390cb35d3759e81c83e27c8a8 100644 (file)
--- a/test/recipes/30-test_evp_data/evppkey_rsa.txt
+++ b/test/recipes/30-test_evp_data/evppkey_rsa.txt
@@ -617,7 +617,7 @@ Title = Test RSA keygen
 # Key generation tests
 
 KeyGen = rsaEncryption
-Ctrl = rsa_keygen_bits:128
+Ctrl = bits:128
 KeyName = tmprsa
 Result = PKEY_CTRL_ERROR
 Reason = key size too small

diff --git a/test/recipes/30-test_evp_data/evppkey_rsa_common.txt b/test/recipes/30-test_evp_data/evppkey_rsa_common.txt
index a28d1196066ba2512c975fbe707edbb6c929d6ff..10a305dd02cefb9f7fa88badceef57217026e5bb 100644 (file)
--- a/test/recipes/30-test_evp_data/evppkey_rsa_common.txt
+++ b/test/recipes/30-test_evp_data/evppkey_rsa_common.txt
@@ -1891,8 +1891,8 @@ Title = Test RSA keygen
 # RSA-PSS with restrictions, should succeed.
 KeyGen = RSASSA-PSS
 KeyName = tmppss
-Ctrl = rsa_pss_keygen_md:sha256
-Ctrl = rsa_pss_keygen_mgf1_md:sha512
+Ctrl = digest:sha256
+Ctrl = mgf1-digest:sha512
 
 # Check MGF1 restrictions
 DigestVerify = SHA256