core: add params argument to key manager's gen_init call

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14383)

diff --git a/include/openssl/core_dispatch.h b/include/openssl/core_dispatch.h
index eb71bc5469ba6c29222bcc209c6668829f123623..a32460bb5457df4db9524de9738b416ecc32097e 100644 (file)
--- a/include/openssl/core_dispatch.h
+++ b/include/openssl/core_dispatch.h
@@ -524,7 +524,7 @@ OSSL_CORE_MAKE_FUNC(void *, keymgmt_new, (void *provctx))
 # define OSSL_FUNC_KEYMGMT_GEN                         6
 # define OSSL_FUNC_KEYMGMT_GEN_CLEANUP                 7
 OSSL_CORE_MAKE_FUNC(void *, keymgmt_gen_init,
-                    (void *provctx, int selection))
+                    (void *provctx, int selection, const OSSL_PARAM params[]))
 OSSL_CORE_MAKE_FUNC(int, keymgmt_gen_set_template,
                     (void *genctx, void *templ))
 OSSL_CORE_MAKE_FUNC(int, keymgmt_gen_set_params,

diff --git a/util/libcrypto.num b/util/libcrypto.num
index 2ca427c63b128e7e109c77d7f8900c749a12ba06..bfd44c2325a7f6ee439c6631f994933cbde92ada 100644 (file)
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -5314,3 +5314,13 @@ EVP_RAND_CTX_settable_params            ?        3_0_0   EXIST::FUNCTION:
 RAND_set_DRBG_type                      ?      3_0_0   EXIST::FUNCTION:
 RAND_set_seed_source_type               ?      3_0_0   EXIST::FUNCTION:
 BIO_f_readbuffer                        ?      3_0_0   EXIST::FUNCTION:
+EVP_DigestInit_ex2                      ?      3_0_0   EXIST::FUNCTION:
+EVP_EncryptInit_ex2                     ?      3_0_0   EXIST::FUNCTION:
+EVP_DecryptInit_ex2                     ?      3_0_0   EXIST::FUNCTION:
+EVP_CipherInit_ex2                      ?      3_0_0   EXIST::FUNCTION:
+EVP_PKEY_sign_init_ex                   ?      3_0_0   EXIST::FUNCTION:
+EVP_PKEY_verify_init_ex                 ?      3_0_0   EXIST::FUNCTION:
+EVP_PKEY_verify_recover_init_ex         ?      3_0_0   EXIST::FUNCTION:
+EVP_PKEY_encrypt_init_ex                ?      3_0_0   EXIST::FUNCTION:
+EVP_PKEY_decrypt_init_ex                ?      3_0_0   EXIST::FUNCTION:
+EVP_PKEY_derive_init_ex                 ?      3_0_0   EXIST::FUNCTION: