From: MscVZoltan <141750063+MscVZoltan@users.noreply.github.com> Date: Wed, 9 Aug 2023 06:43:40 +0000 (+0200) Subject: Don't use C++ reserved word template for function arguments X-Git-Tag: openssl-3.2.0-alpha1~259 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=420a0874db8a6b0070d4820e81e82bf48412d7da;p=thirdparty%2Fopenssl.git Don't use C++ reserved word template for function arguments CLA: trivial Reviewed-by: Paul Dale Reviewed-by: Tom Cosgrove Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/21692) --- diff --git a/crypto/evp/keymgmt_meth.c b/crypto/evp/keymgmt_meth.c index 0f767eaddb5..882c068a71b 100644 --- a/crypto/evp/keymgmt_meth.c +++ b/crypto/evp/keymgmt_meth.c @@ -346,7 +346,7 @@ void *evp_keymgmt_gen_init(const EVP_KEYMGMT *keymgmt, int selection, } int evp_keymgmt_gen_set_template(const EVP_KEYMGMT *keymgmt, void *genctx, - void *template) + void *templ) { /* * It's arguable if we actually should return success in this case, as @@ -356,7 +356,7 @@ int evp_keymgmt_gen_set_template(const EVP_KEYMGMT *keymgmt, void *genctx, */ if (keymgmt->gen_set_template == NULL) return 1; - return keymgmt->gen_set_template(genctx, template); + return keymgmt->gen_set_template(genctx, templ); } int evp_keymgmt_gen_set_params(const EVP_KEYMGMT *keymgmt, void *genctx, diff --git a/include/crypto/evp.h b/include/crypto/evp.h index 560a2898e99..566b7889dbc 100644 --- a/include/crypto/evp.h +++ b/include/crypto/evp.h @@ -812,7 +812,7 @@ int evp_keymgmt_set_params(const EVP_KEYMGMT *keymgmt, void *evp_keymgmt_gen_init(const EVP_KEYMGMT *keymgmt, int selection, const OSSL_PARAM params[]); int evp_keymgmt_gen_set_template(const EVP_KEYMGMT *keymgmt, void *genctx, - void *template); + void *templ); int evp_keymgmt_gen_set_params(const EVP_KEYMGMT *keymgmt, void *genctx, const OSSL_PARAM params[]); void *evp_keymgmt_gen(const EVP_KEYMGMT *keymgmt, void *genctx,