diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2021-03-20 13:49:08 +0100 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2021-05-11 12:46:42 +0200 |
| commit | f925315203f77d0241183ccabfc784d259b0a152 (patch) | |
| tree | 2d92c75d7e19d48de1ed8da32b724b3603f5a3c6 /test/evp_libctx_test.c | |
| parent | 6dbb277627de86578577185084378135605d2df1 (diff) | |
Add convenience functions and macros for asymmetric key generation
Add EVP_PKEY_gen(), EVP_PKEY_Q_gen(), EVP_RSA_gen(), and EVP_EC_gen().
Also export auxiliary function OSSL_EC_curve_nid2name()
and improve deprecation info on RSA and EC key generation/management functions.
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14695)
Diffstat (limited to 'test/evp_libctx_test.c')
| -rw-r--r-- | test/evp_libctx_test.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/test/evp_libctx_test.c b/test/evp_libctx_test.c index 6dff939467..cb8b3b7fb4 100644 --- a/test/evp_libctx_test.c +++ b/test/evp_libctx_test.c @@ -488,16 +488,12 @@ static void collect_cipher_names(EVP_CIPHER *cipher, void *cipher_names_list) static int rsa_keygen(int bits, EVP_PKEY **pub, EVP_PKEY **priv) { int ret = 0; - EVP_PKEY_CTX *keygen_ctx = NULL; unsigned char *pub_der = NULL; const unsigned char *pp = NULL; size_t len = 0; OSSL_ENCODER_CTX *ectx = NULL; - if (!TEST_ptr(keygen_ctx = EVP_PKEY_CTX_new_from_name(libctx, "RSA", NULL)) - || !TEST_int_gt(EVP_PKEY_keygen_init(keygen_ctx), 0) - || !TEST_true(EVP_PKEY_CTX_set_rsa_keygen_bits(keygen_ctx, bits)) - || !TEST_int_gt(EVP_PKEY_keygen(keygen_ctx, priv), 0) + if (!TEST_ptr(*priv = EVP_PKEY_Q_keygen(libctx, NULL, "RSA", bits)) || !TEST_ptr(ectx = OSSL_ENCODER_CTX_new_for_pkey(*priv, EVP_PKEY_PUBLIC_KEY, @@ -512,7 +508,6 @@ static int rsa_keygen(int bits, EVP_PKEY **pub, EVP_PKEY **priv) err: OSSL_ENCODER_CTX_free(ectx); OPENSSL_free(pub_der); - EVP_PKEY_CTX_free(keygen_ctx); return ret; } |