diff options
| author | Daniel Bevenius <daniel.bevenius@gmail.com> | 2020-10-09 06:07:43 +0200 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-01-28 16:25:16 +0100 |
| commit | e947a0642db111bb34547b5f7d48e13163492ca5 (patch) | |
| tree | a5e71dbadff8d328df119f0c2f12fc8dcbcfa61f /test/evp_extra_test.c | |
| parent | d744934b756bc71344818a2cb60b13dd89954afb (diff) | |
EVP: fix keygen for EVP_PKEY_RSA_PSS
This commit attempts to fix the an issue when generating a key of type
EVP_PKEY_RSA_PSS. Currently, EVP_PKEY_CTX_set_rsa_keygen_bits will
return -1 if the key id is not of type EVP_PKEY_RSA. This commit adds
EVP_PKEY_RSA_PSS to also be accepted.
The macro EVP_PKEY_CTX_set_rsa_pss_keygen_md si converted into a
function and it is now called in legacy_ctrl_to_param.
Fixes #12384
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13099)
Diffstat (limited to 'test/evp_extra_test.c')
| -rw-r--r-- | test/evp_extra_test.c | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c index 2ef16bc07c..6cca821cf1 100644 --- a/test/evp_extra_test.c +++ b/test/evp_extra_test.c @@ -29,6 +29,7 @@ #include <openssl/dh.h> #include <openssl/aes.h> #include <openssl/decoder.h> +#include <openssl/rsa.h> #include "testutil.h" #include "internal/nelem.h" #include "internal/sizes.h" @@ -2256,6 +2257,31 @@ err: return ret; } +static int test_EVP_rsa_pss_with_keygen_bits(void) +{ + int ret; + OSSL_PROVIDER *provider; + EVP_PKEY_CTX *ctx; + EVP_PKEY *pkey; + const EVP_MD *md; + pkey = NULL; + ret = 0; + provider = OSSL_PROVIDER_load(NULL, "default"); + md = EVP_get_digestbyname("sha256"); + + ret = TEST_ptr((ctx = EVP_PKEY_CTX_new_id(EVP_PKEY_RSA_PSS, NULL))) + && TEST_true(EVP_PKEY_keygen_init(ctx)) + && TEST_int_gt(EVP_PKEY_CTX_set_rsa_keygen_bits(ctx, 512), 0) + && TEST_true(EVP_PKEY_CTX_set_rsa_pss_keygen_md(ctx, md)) + && TEST_true(EVP_PKEY_keygen(ctx, &pkey)); + + EVP_PKEY_free(pkey); + EVP_PKEY_CTX_free(ctx); + OSSL_PROVIDER_unload(provider); + return ret; +} + + int setup_tests(void) { testctx = OSSL_LIB_CTX_new(); @@ -2321,6 +2347,7 @@ int setup_tests(void) ADD_TEST(test_rand_agglomeration); ADD_ALL_TESTS(test_evp_iv, 10); + ADD_TEST(test_EVP_rsa_pss_with_keygen_bits); return 1; } |