From: Milan Broz Date: Tue, 2 Dec 2025 11:51:08 +0000 (+0100) Subject: Remove no longer needed macro argument X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f2ed7652e3c4318c20a768dafef853484e86457d;p=thirdparty%2Fopenssl.git Remove no longer needed macro argument Resolves: https://github.com/openssl/project/issues/1736 Signed-off-by: Milan Broz Reviewed-by: Eugene Syromiatnikov Reviewed-by: Tomas Mraz Reviewed-by: Norbert Pocs Reviewed-by: Saša Nedvědický Reviewed-by: Saša Nedvědický Reviewed-by: Neil Horman Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/29305) --- diff --git a/include/openssl/engine.h b/include/openssl/engine.h index a544f39aa05..274a9bdef2c 100644 --- a/include/openssl/engine.h +++ b/include/openssl/engine.h @@ -37,7 +37,7 @@ # define ENGINE_INFO_MSG \ " API symbol is replaced with stub to avoid linker error." -# define ENGINE_FUNC(ret_type, name, args, args_names, default_val) \ +# define ENGINE_FUNC(ret_type, name, args, default_val) \ OSSL_DEPRECATED_MESSAGE(#name ENGINE_INFO_MSG) \ static inline ret_type name args \ { \ @@ -51,7 +51,7 @@ return default_val; /* stub return */ \ } -# define ENGINE_VOID_FUNC(name, args, args_names) \ +# define ENGINE_VOID_FUNC(name, args) \ OSSL_DEPRECATED_MESSAGE(#name ENGINE_INFO_MSG) \ static inline void name args \ { \ @@ -66,7 +66,7 @@ # define ENGINE_INFO_MSG \ " API symbol is removed. Define OPENSSL_ENGINE_STUBS to mask linker errors." -# define ENGINE_FUNC(ret_type, name, args, args_names, default_val) \ +# define ENGINE_FUNC(ret_type, name, args, default_val) \ OSSL_DEPRECATED_MESSAGE(#name ENGINE_INFO_MSG) \ ret_type name args; @@ -74,7 +74,7 @@ OSSL_DEPRECATED_MESSAGE(#name ENGINE_INFO_MSG) \ ret_type name(void); -# define ENGINE_VOID_FUNC(name, args, args_names) \ +# define ENGINE_VOID_FUNC(name, args) \ OSSL_DEPRECATED_MESSAGE(#name ENGINE_INFO_MSG) \ void name args; @@ -399,26 +399,26 @@ ENGINE_FUNC_NOARGS(ENGINE *, ENGINE_get_last, NULL) /* Iterate to the next/previous "ENGINE" type (NULL = end of the list). */ # ifndef OPENSSL_NO_DEPRECATED_3_0 /* OSSL_DEPRECATEDIN_3_0 ENGINE *ENGINE_get_next(ENGINE *e); */ -ENGINE_FUNC(ENGINE *, ENGINE_get_next, (ENGINE *e), (e), NULL) +ENGINE_FUNC(ENGINE *, ENGINE_get_next, (ENGINE *e), NULL) /* OSSL_DEPRECATEDIN_3_0 ENGINE *ENGINE_get_prev(ENGINE *e); */ -ENGINE_FUNC(ENGINE *, ENGINE_get_prev, (ENGINE *e), (e), NULL) +ENGINE_FUNC(ENGINE *, ENGINE_get_prev, (ENGINE *e), NULL) # endif /* Add another "ENGINE" type into the array. */ # ifndef OPENSSL_NO_DEPRECATED_3_0 /* OSSL_DEPRECATEDIN_3_0 int ENGINE_add(ENGINE *e); */ -ENGINE_FUNC(int, ENGINE_add, (ENGINE *e), (e), 0) +ENGINE_FUNC(int, ENGINE_add, (ENGINE *e), 0) # endif /* Remove an existing "ENGINE" type from the array. */ # ifndef OPENSSL_NO_DEPRECATED_3_0 /* OSSL_DEPRECATEDIN_3_0 int ENGINE_remove(ENGINE *e); */ -ENGINE_FUNC(int, ENGINE_remove, (ENGINE *e), (e), 0) +ENGINE_FUNC(int, ENGINE_remove, (ENGINE *e), 0) # endif /* Retrieve an engine from the list by its unique "id" value. */ # ifndef OPENSSL_NO_DEPRECATED_3_0 /* OSSL_DEPRECATEDIN_3_0 ENGINE *ENGINE_by_id(const char *id); */ -ENGINE_FUNC(ENGINE *, ENGINE_by_id, (const char *id), (id), NULL) +ENGINE_FUNC(ENGINE *, ENGINE_by_id, (const char *id), NULL) # endif # ifndef OPENSSL_NO_DEPRECATED_1_1_0 @@ -446,7 +446,7 @@ ENGINE_VOID_FUNC_NOARGS(ENGINE_load_builtin_engines) ENGINE_FUNC_NOARGS(unsigned int, ENGINE_get_table_flags, 0) /* OSSL_DEPRECATEDIN_3_0 void ENGINE_set_table_flags(unsigned int flags); */ -ENGINE_VOID_FUNC(ENGINE_set_table_flags, (unsigned int flags), (flags)) +ENGINE_VOID_FUNC(ENGINE_set_table_flags, (unsigned int flags)) # endif /*- Manage registration of ENGINEs per "table". For each type, there are 3 @@ -458,57 +458,57 @@ ENGINE_VOID_FUNC(ENGINE_set_table_flags, (unsigned int flags), (flags)) */ # ifndef OPENSSL_NO_DEPRECATED_3_0 /* OSSL_DEPRECATEDIN_3_0 int ENGINE_register_RSA(ENGINE *e); */ -ENGINE_FUNC(int, ENGINE_register_RSA, (ENGINE *e), (e), 0) +ENGINE_FUNC(int, ENGINE_register_RSA, (ENGINE *e), 0) /* OSSL_DEPRECATEDIN_3_0 void ENGINE_unregister_RSA(ENGINE *e); */ -ENGINE_VOID_FUNC(ENGINE_unregister_RSA, (ENGINE *e), (e)) +ENGINE_VOID_FUNC(ENGINE_unregister_RSA, (ENGINE *e)) /* OSSL_DEPRECATEDIN_3_0 void ENGINE_register_all_RSA(void); */ ENGINE_VOID_FUNC_NOARGS(ENGINE_register_all_RSA) /* OSSL_DEPRECATEDIN_3_0 int ENGINE_register_DSA(ENGINE *e); */ -ENGINE_FUNC(int, ENGINE_register_DSA, (ENGINE *e), (e), 0) +ENGINE_FUNC(int, ENGINE_register_DSA, (ENGINE *e), 0) /* OSSL_DEPRECATEDIN_3_0 void ENGINE_unregister_DSA(ENGINE *e); */ -ENGINE_VOID_FUNC(ENGINE_unregister_DSA, (ENGINE *e), (e)) +ENGINE_VOID_FUNC(ENGINE_unregister_DSA, (ENGINE *e)) /* OSSL_DEPRECATEDIN_3_0 void ENGINE_register_all_DSA(void); */ ENGINE_VOID_FUNC_NOARGS(ENGINE_register_all_DSA) /* OSSL_DEPRECATEDIN_3_0 int ENGINE_register_EC(ENGINE *e); */ -ENGINE_FUNC(int, ENGINE_register_EC, (ENGINE *e), (e), 0) +ENGINE_FUNC(int, ENGINE_register_EC, (ENGINE *e), 0) /* OSSL_DEPRECATEDIN_3_0 void ENGINE_unregister_EC(ENGINE *e); */ -ENGINE_VOID_FUNC(ENGINE_unregister_EC, (ENGINE *e), (e)) +ENGINE_VOID_FUNC(ENGINE_unregister_EC, (ENGINE *e)) /* OSSL_DEPRECATEDIN_3_0 void ENGINE_register_all_EC(void); */ ENGINE_VOID_FUNC_NOARGS(ENGINE_unregister_all_EC) /* OSSL_DEPRECATEDIN_3_0 int ENGINE_register_DH(ENGINE *e); */ -ENGINE_FUNC(int, ENGINE_register_DH, (ENGINE *e), (e), 0) +ENGINE_FUNC(int, ENGINE_register_DH, (ENGINE *e), 0) /* OSSL_DEPRECATEDIN_3_0 void ENGINE_unregister_DH(ENGINE *e); */ -ENGINE_VOID_FUNC(ENGINE_unregister_DH, (ENGINE *e), (e)) +ENGINE_VOID_FUNC(ENGINE_unregister_DH, (ENGINE *e)) /* OSSL_DEPRECATEDIN_3_0 void ENGINE_register_all_DH(void); */ ENGINE_VOID_FUNC_NOARGS(ENGINE_register_all_DH) /* OSSL_DEPRECATEDIN_3_0 int ENGINE_register_RAND(ENGINE *e); */ -ENGINE_FUNC(int, ENGINE_register_RAND, (ENGINE *e), (e), 0) +ENGINE_FUNC(int, ENGINE_register_RAND, (ENGINE *e), 0) /* OSSL_DEPRECATEDIN_3_0 void ENGINE_unregister_RAND(ENGINE *e); */ -ENGINE_VOID_FUNC(ENGINE_unregister_RAND, (ENGINE *e), (e)) +ENGINE_VOID_FUNC(ENGINE_unregister_RAND, (ENGINE *e)) /* OSSL_DEPRECATEDIN_3_0 void ENGINE_register_all_RAND(void); */ ENGINE_VOID_FUNC_NOARGS(ENGINE_register_all_RAND) /* OSSL_DEPRECATEDIN_3_0 int ENGINE_register_ciphers(ENGINE *e); */ -ENGINE_FUNC(int, ENGINE_register_ciphers, (ENGINE *e), (e), 0) +ENGINE_FUNC(int, ENGINE_register_ciphers, (ENGINE *e), 0) /* OSSL_DEPRECATEDIN_3_0 void ENGINE_unregister_ciphers(ENGINE *e); */ -ENGINE_VOID_FUNC(ENGINE_unregister_ciphers, (ENGINE *e), (e)) +ENGINE_VOID_FUNC(ENGINE_unregister_ciphers, (ENGINE *e)) /* OSSL_DEPRECATEDIN_3_0 void ENGINE_register_all_ciphers(void); */ ENGINE_VOID_FUNC_NOARGS(ENGINE_register_all_ciphers) /* OSSL_DEPRECATEDIN_3_0 int ENGINE_register_digests(ENGINE *e); */ -ENGINE_FUNC(int, ENGINE_register_digests, (ENGINE *e), (e), 0) +ENGINE_FUNC(int, ENGINE_register_digests, (ENGINE *e), 0) /* OSSL_DEPRECATEDIN_3_0 void ENGINE_unregister_digests(ENGINE *e); */ -ENGINE_VOID_FUNC(ENGINE_unregister_digests, (ENGINE *e), (e)) +ENGINE_VOID_FUNC(ENGINE_unregister_digests, (ENGINE *e)) /* OSSL_DEPRECATEDIN_3_0 void ENGINE_register_all_digests(void); */ ENGINE_VOID_FUNC_NOARGS(ENGINE_register_all_digests) /* OSSL_DEPRECATEDIN_3_0 int ENGINE_register_pkey_meths(ENGINE *e); */ -ENGINE_FUNC(int, ENGINE_register_pkey_meths, (ENGINE *e), (e), 0) +ENGINE_FUNC(int, ENGINE_register_pkey_meths, (ENGINE *e), 0) /* OSSL_DEPRECATEDIN_3_0 void ENGINE_unregister_pkey_meths(ENGINE *e); */ -ENGINE_VOID_FUNC(ENGINE_unregister_pkey_meths, (ENGINE *e), (e)) +ENGINE_VOID_FUNC(ENGINE_unregister_pkey_meths, (ENGINE *e)) /* OSSL_DEPRECATEDIN_3_0 void ENGINE_register_all_pkey_meths(void); */ ENGINE_VOID_FUNC_NOARGS(ENGINE_register_all_pkey_meths) /* OSSL_DEPRECATEDIN_3_0 int ENGINE_register_pkey_asn1_meths(ENGINE *e); */ -ENGINE_FUNC(int, ENGINE_register_pkey_asn1_meths, (ENGINE *e), (e), 0) +ENGINE_FUNC(int, ENGINE_register_pkey_asn1_meths, (ENGINE *e), 0) /* OSSL_DEPRECATEDIN_3_0 void ENGINE_unregister_pkey_asn1_meths(ENGINE *e); */ -ENGINE_VOID_FUNC(ENGINE_unregister_pkey_asn1_meths, (ENGINE *e), (e)) +ENGINE_VOID_FUNC(ENGINE_unregister_pkey_asn1_meths, (ENGINE *e)) /* OSSL_DEPRECATEDIN_3_0 void ENGINE_register_all_pkey_asn1_meths(void); */ ENGINE_VOID_FUNC_NOARGS(ENGINE_register_all_pkey_asn1_meths) # endif @@ -521,7 +521,7 @@ ENGINE_VOID_FUNC_NOARGS(ENGINE_register_all_pkey_asn1_meths) */ # ifndef OPENSSL_NO_DEPRECATED_3_0 /* OSSL_DEPRECATEDIN_3_0 int ENGINE_register_complete(ENGINE *e); */ -ENGINE_FUNC(int, ENGINE_register_complete, (ENGINE *e), (e), 0) +ENGINE_FUNC(int, ENGINE_register_complete, (ENGINE *e), 0) /* OSSL_DEPRECATEDIN_3_0 int ENGINE_register_all_complete(void); */ ENGINE_FUNC_NOARGS(int, ENGINE_register_all_complete, 0) # endif @@ -542,7 +542,7 @@ ENGINE_FUNC_NOARGS(int, ENGINE_register_all_complete, 0) * void (*f) (void)); */ ENGINE_FUNC(int, ENGINE_ctrl, (ENGINE *e, int cmd, long i, void *p, - void (*f) (void)), (e, cmd, i, p, f), 0) + void (*f) (void)), 0) # endif /* @@ -553,7 +553,7 @@ ENGINE_FUNC(int, ENGINE_ctrl, (ENGINE *e, int cmd, long i, void *p, */ # ifndef OPENSSL_NO_DEPRECATED_3_0 /* OSSL_DEPRECATEDIN_3_0 int ENGINE_cmd_is_executable(ENGINE *e, int cmd); */ -ENGINE_FUNC(int, ENGINE_cmd_is_executable, (ENGINE *e, int cmd), (e, cmd), 0) +ENGINE_FUNC(int, ENGINE_cmd_is_executable, (ENGINE *e, int cmd), 0) # endif /* @@ -570,7 +570,7 @@ ENGINE_FUNC(int, ENGINE_cmd_is_executable, (ENGINE *e, int cmd), (e, cmd), 0) */ ENGINE_FUNC(int, ENGINE_ctrl_cmd, (ENGINE *e, const char *cmd_name, long i, void *p, void (*f) (void), - int cmd_optional), (e, cmd_name, i, p, f), 0) + int cmd_optional), 0) # endif /* @@ -602,8 +602,7 @@ ENGINE_FUNC(int, ENGINE_ctrl_cmd, (ENGINE *e, const char *cmd_name, long i, * int cmd_optional); */ ENGINE_FUNC(int, ENGINE_ctrl_cmd_string, - (ENGINE *e, const char *cmd_name, const char *arg, int cmd_optional), - (e, cmd_name, arg, cmd_optional), 0) + (ENGINE *e, const char *cmd_name, const char *arg, int cmd_optional), 0) # endif /* @@ -618,125 +617,111 @@ ENGINE_FUNC(int, ENGINE_ctrl_cmd_string, /* OSSL_DEPRECATEDIN_3_0 ENGINE *ENGINE_new(void); */ ENGINE_FUNC_NOARGS(ENGINE *, ENGINE_new, NULL) /* OSSL_DEPRECATEDIN_3_0 int ENGINE_free(ENGINE *e); */ -ENGINE_FUNC(int, ENGINE_free, (ENGINE *e), (e), 0) +ENGINE_FUNC(int, ENGINE_free, (ENGINE *e), 0) /* OSSL_DEPRECATEDIN_3_0 int ENGINE_up_ref(ENGINE *e); */ -ENGINE_FUNC(int, ENGINE_up_ref, (ENGINE *e), (e), 0) +ENGINE_FUNC(int, ENGINE_up_ref, (ENGINE *e), 0) /* OSSL_DEPRECATEDIN_3_0 int ENGINE_set_id(ENGINE *e, const char *id); */ -ENGINE_FUNC(int, ENGINE_set_id, (ENGINE *e, const char *id), (e, id), 0) +ENGINE_FUNC(int, ENGINE_set_id, (ENGINE *e, const char *id), 0) /* OSSL_DEPRECATEDIN_3_0 int ENGINE_set_name(ENGINE *e, const char *name); */ -ENGINE_FUNC(int, ENGINE_set_name, (ENGINE *e, const char *name), (e, name), 0) +ENGINE_FUNC(int, ENGINE_set_name, (ENGINE *e, const char *name), 0) /* * OSSL_DEPRECATEDIN_3_0 * int ENGINE_set_RSA(ENGINE *e, const RSA_METHOD *rsa_meth); */ -ENGINE_FUNC(int, ENGINE_set_RSA, (ENGINE *e, const RSA_METHOD *rsa_meth), - (e, rsa_meth), 0) +ENGINE_FUNC(int, ENGINE_set_RSA, (ENGINE *e, const RSA_METHOD *rsa_meth), 0) /* * OSSL_DEPRECATEDIN_3_0 * int ENGINE_set_DSA(ENGINE *e, const DSA_METHOD *dsa_meth); */ -ENGINE_FUNC(int, ENGINE_set_DSA, (ENGINE *e, const DSA_METHOD *dsa_meth), - (e, dsa_meth), 0) +ENGINE_FUNC(int, ENGINE_set_DSA, (ENGINE *e, const DSA_METHOD *dsa_meth), 0) /* * OSSL_DEPRECATEDIN_3_0 * int ENGINE_set_EC(ENGINE *e, const EC_KEY_METHOD *ecdsa_meth); */ -ENGINE_FUNC(int, ENGINE_set_EC, (ENGINE *e, const EC_KEY_METHOD *ecdsa_meth), - (e, ecdsa_meth), 0) +ENGINE_FUNC(int, ENGINE_set_EC, (ENGINE *e, const EC_KEY_METHOD *ecdsa_meth), 0) /* * OSSL_DEPRECATEDIN_3_0 * int ENGINE_set_DH(ENGINE *e, const DH_METHOD *dh_meth); */ -ENGINE_FUNC(int, ENGINE_set_DH, (ENGINE *e, const DH_METHOD *dh_meth), - (e, dh_meth), 0) +ENGINE_FUNC(int, ENGINE_set_DH, (ENGINE *e, const DH_METHOD *dh_meth), 0) /* * OSSL_DEPRECATEDIN_3_0 * int ENGINE_set_RAND(ENGINE *e, const RAND_METHOD *rand_meth); */ -ENGINE_FUNC(int, ENGINE_set_RAND, (ENGINE *e, const RAND_METHOD *rand_meth), - (e, rand_meth), 0) +ENGINE_FUNC(int, ENGINE_set_RAND, (ENGINE *e, const RAND_METHOD *rand_meth), 0) /* * OSSL_DEPRECATEDIN_3_0 * int ENGINE_set_destroy_function(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR destroy_f); */ ENGINE_FUNC(int, ENGINE_set_destroy_function, - (ENGINE *e, ENGINE_GEN_INT_FUNC_PTR destroy_f), - (e, destroy_f), 0) + (ENGINE *e, ENGINE_GEN_INT_FUNC_PTR destroy_f), 0) /* * OSSL_DEPRECATEDIN_3_0 * int ENGINE_set_init_function(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR init_f); */ ENGINE_FUNC(int, ENGINE_set_init_function, - (ENGINE *e, ENGINE_GEN_INT_FUNC_PTR init_f), - (e, init_f), 0) + (ENGINE *e, ENGINE_GEN_INT_FUNC_PTR init_f), 0) /* * OSSL_DEPRECATEDIN_3_0 * int ENGINE_set_finish_function(ENGINE *e, ENGINE_GEN_INT_FUNC_PTR finish_f); */ ENGINE_FUNC(int, ENGINE_set_finish_function, - (ENGINE *e, ENGINE_GEN_INT_FUNC_PTR finish_f), - (e, finish_f), 0) + (ENGINE *e, ENGINE_GEN_INT_FUNC_PTR finish_f), 0) /* * OSSL_DEPRECATEDIN_3_0 * int ENGINE_set_ctrl_function(ENGINE *e, ENGINE_CTRL_FUNC_PTR ctrl_f); */ ENGINE_FUNC(int, ENGINE_set_ctrl_function, - (ENGINE *e, ENGINE_CTRL_FUNC_PTR ctrl_f), - (e, ctrl_f), 0) + (ENGINE *e, ENGINE_CTRL_FUNC_PTR ctrl_f), 0) /* * OSSL_DEPRECATEDIN_3_0 * int ENGINE_set_load_privkey_function(ENGINE *e, ENGINE_LOAD_KEY_PTR loadpriv_f); */ ENGINE_FUNC(int, ENGINE_set_load_privkey_function, - (ENGINE *e, ENGINE_LOAD_KEY_PTR loadpriv_f), - (e, loadpriv_f), 0) + (ENGINE *e, ENGINE_LOAD_KEY_PTR loadpriv_f), 0) /* * OSSL_DEPRECATEDIN_3_0 * int ENGINE_set_load_pubkey_function(ENGINE *e, ENGINE_LOAD_KEY_PTR loadpub_f); */ ENGINE_FUNC(int, ENGINE_set_load_pubkey_function, - (ENGINE *e, ENGINE_LOAD_KEY_PTR loadpub_f), - (e, loadpub_f), 0) + (ENGINE *e, ENGINE_LOAD_KEY_PTR loadpub_f), 0) /* * OSSL_DEPRECATEDIN_3_0 * int ENGINE_set_load_ssl_client_cert_function(ENGINE *e, * ENGINE_SSL_CLIENT_CERT_PTR loadssl_f); */ ENGINE_FUNC(int, ENGINE_set_load_ssl_client_cert_function, - (ENGINE *e, ENGINE_SSL_CLIENT_CERT_PTR loadssl_f), - (e, loadssl_f), 0) + (ENGINE *e, ENGINE_SSL_CLIENT_CERT_PTR loadssl_f), 0) /* * OSSL_DEPRECATEDIN_3_0 * int ENGINE_set_ciphers(ENGINE *e, ENGINE_CIPHERS_PTR f); */ -ENGINE_FUNC(int, ENGINE_set_ciphers, (ENGINE *e, ENGINE_CIPHERS_PTR f), (e, f), 0) +ENGINE_FUNC(int, ENGINE_set_ciphers, (ENGINE *e, ENGINE_CIPHERS_PTR f), 0) /* * OSSL_DEPRECATEDIN_3_0 * int ENGINE_set_digests(ENGINE *e, ENGINE_DIGESTS_PTR f); */ -ENGINE_FUNC(int, ENGINE_set_digests, (ENGINE *e, ENGINE_DIGESTS_PTR f), (e, f), 0) +ENGINE_FUNC(int, ENGINE_set_digests, (ENGINE *e, ENGINE_DIGESTS_PTR f), 0) /* * OSSL_DEPRECATEDIN_3_0 * int ENGINE_set_pkey_meths(ENGINE *e, ENGINE_PKEY_METHS_PTR f); */ -ENGINE_FUNC(int, ENGINE_set_pkey_meths, (ENGINE *e, ENGINE_PKEY_METHS_PTR f), - (e, f), 0) +ENGINE_FUNC(int, ENGINE_set_pkey_meths, (ENGINE *e, ENGINE_PKEY_METHS_PTR f), 0) /* * OSSL_DEPRECATEDIN_3_0 * int ENGINE_set_pkey_asn1_meths(ENGINE *e, ENGINE_PKEY_ASN1_METHS_PTR f); */ ENGINE_FUNC(int, ENGINE_set_pkey_asn1_meths, (ENGINE *e, ENGINE_PKEY_ASN1_METHS_PTR f), - (e, f), 0) + 0) /* * OSSL_DEPRECATEDIN_3_0 int ENGINE_set_flags(ENGINE *e, int flags); */ -ENGINE_FUNC(int, ENGINE_set_flags, (ENGINE *e, int flags), (e, flags), 0) +ENGINE_FUNC(int, ENGINE_set_flags, (ENGINE *e, int flags), 0) /* * OSSL_DEPRECATEDIN_3_0 * int ENGINE_set_cmd_defns(ENGINE *e, const ENGINE_CMD_DEFN *defns); */ -ENGINE_FUNC(int, ENGINE_set_cmd_defns, (ENGINE *e, const ENGINE_CMD_DEFN *defns), - (e, defns), 0) +ENGINE_FUNC(int, ENGINE_set_cmd_defns, (ENGINE *e, const ENGINE_CMD_DEFN *defns), 0) # endif /* These functions allow control over any per-structure ENGINE data. */ # ifndef OPENSSL_ENGINE_STUBS @@ -744,18 +729,16 @@ ENGINE_FUNC(int, ENGINE_set_cmd_defns, (ENGINE *e, const ENGINE_CMD_DEFN *defns) CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_ENGINE, l, p, newf, dupf, freef) # else ENGINE_FUNC(int, ENGINE_get_ex_new_index, (long l, void *p, CRYPTO_EX_new *newf, - CRYPTO_EX_dup *dupf, CRYPTO_EX_free *freef), - (l, p, newf, dupf, freef), 0) + CRYPTO_EX_dup *dupf, CRYPTO_EX_free *freef), 0) # endif # ifndef OPENSSL_NO_DEPRECATED_3_0 /* * OSSL_DEPRECATEDIN_3_0 * int ENGINE_set_ex_data(ENGINE *e, int idx, void *arg); */ -ENGINE_FUNC(int, ENGINE_set_ex_data, (ENGINE *e, int idx, void *arg), - (e, idx, arg), 0) +ENGINE_FUNC(int, ENGINE_set_ex_data, (ENGINE *e, int idx, void *arg), 0) /* OSSL_DEPRECATEDIN_3_0 void *ENGINE_get_ex_data(const ENGINE *e, int idx); */ -ENGINE_FUNC(void *, ENGINE_get_ex_data, (ENGINE *e, int idx), (e, idx), NULL) +ENGINE_FUNC(void *, ENGINE_get_ex_data, (ENGINE *e, int idx), NULL) # endif # ifndef OPENSSL_NO_DEPRECATED_1_1_0 @@ -774,131 +757,131 @@ ENGINE_FUNC(void *, ENGINE_get_ex_data, (ENGINE *e, int idx), (e, idx), NULL) */ # ifndef OPENSSL_NO_DEPRECATED_3_0 /* OSSL_DEPRECATEDIN_3_0 const char *ENGINE_get_id(const ENGINE *e); */ -ENGINE_FUNC(const char *, ENGINE_get_id, (const ENGINE *e), (e), NULL) +ENGINE_FUNC(const char *, ENGINE_get_id, (const ENGINE *e), NULL) /* OSSL_DEPRECATEDIN_3_0 const char *ENGINE_get_name(const ENGINE *e); */ -ENGINE_FUNC(const char *, ENGINE_get_name, (const ENGINE *e), (e), NULL) +ENGINE_FUNC(const char *, ENGINE_get_name, (const ENGINE *e), NULL) /* OSSL_DEPRECATEDIN_3_0 const RSA_METHOD *ENGINE_get_RSA(const ENGINE *e); */ -ENGINE_FUNC(const RSA_METHOD *, ENGINE_get_RSA, (const ENGINE *e), (e), NULL) +ENGINE_FUNC(const RSA_METHOD *, ENGINE_get_RSA, (const ENGINE *e), NULL) /* OSSL_DEPRECATEDIN_3_0 const DSA_METHOD *ENGINE_get_DSA(const ENGINE *e); */ -ENGINE_FUNC(const DSA_METHOD *, ENGINE_get_DSA, (const ENGINE *e), (e), NULL) +ENGINE_FUNC(const DSA_METHOD *, ENGINE_get_DSA, (const ENGINE *e), NULL) /* OSSL_DEPRECATEDIN_3_0 const EC_KEY_METHOD *ENGINE_get_EC(const ENGINE *e); */ -ENGINE_FUNC(const EC_KEY_METHOD *, ENGINE_get_EC, (const ENGINE *e), (e), NULL) +ENGINE_FUNC(const EC_KEY_METHOD *, ENGINE_get_EC, (const ENGINE *e), NULL) /* OSSL_DEPRECATEDIN_3_0 const DH_METHOD *ENGINE_get_DH(const ENGINE *e); */ -ENGINE_FUNC(const DH_METHOD *, ENGINE_get_DH, (const ENGINE *e), (e), NULL) +ENGINE_FUNC(const DH_METHOD *, ENGINE_get_DH, (const ENGINE *e), NULL) /* OSSL_DEPRECATEDIN_3_0 const RAND_METHOD *ENGINE_get_RAND(const ENGINE *e); */ -ENGINE_FUNC(const RAND_METHOD *, ENGINE_get_RAND, (const ENGINE *e), (e), NULL) +ENGINE_FUNC(const RAND_METHOD *, ENGINE_get_RAND, (const ENGINE *e), NULL) /* * OSSL_DEPRECATEDIN_3_0 * ENGINE_GEN_INT_FUNC_PTR ENGINE_get_destroy_function(const ENGINE *e); */ ENGINE_FUNC(ENGINE_GEN_INT_FUNC_PTR, ENGINE_get_destroy_function, - (const ENGINE *e), (e), NULL) + (const ENGINE *e), NULL) /* * OSSL_DEPRECATEDIN_3_0 * ENGINE_GEN_INT_FUNC_PTR ENGINE_get_init_function(const ENGINE *e); */ ENGINE_FUNC(ENGINE_GEN_INT_FUNC_PTR, ENGINE_get_init_function, - (const ENGINE *e), (e), NULL) + (const ENGINE *e), NULL) /* * OSSL_DEPRECATEDIN_3_0 * ENGINE_GEN_INT_FUNC_PTR ENGINE_get_finish_function(const ENGINE *e); */ ENGINE_FUNC(ENGINE_GEN_INT_FUNC_PTR, ENGINE_get_finish_function, - (const ENGINE *e), (e), NULL) + (const ENGINE *e), NULL) /* * OSSL_DEPRECATEDIN_3_0 * ENGINE_CTRL_FUNC_PTR ENGINE_get_ctrl_function(const ENGINE *e); */ ENGINE_FUNC(ENGINE_CTRL_FUNC_PTR, ENGINE_get_ctrl_function, - (const ENGINE *e), (e), NULL) + (const ENGINE *e), NULL) /* * OSSL_DEPRECATEDIN_3_0 * ENGINE_LOAD_KEY_PTR ENGINE_get_load_privkey_function(const ENGINE *e); */ ENGINE_FUNC(ENGINE_LOAD_KEY_PTR, ENGINE_get_load_privkey_function, - (const ENGINE *e), (e), NULL) + (const ENGINE *e), NULL) /* * OSSL_DEPRECATEDIN_3_0 * ENGINE_LOAD_KEY_PTR ENGINE_get_load_pubkey_function(const ENGINE *e); */ ENGINE_FUNC(ENGINE_LOAD_KEY_PTR, ENGINE_get_load_pubkey_function, - (const ENGINE *e), (e), NULL) + (const ENGINE *e), NULL) /* * OSSL_DEPRECATEDIN_3_0 ENGINE_SSL_CLIENT_CERT_PTR * ENGINE_get_ssl_client_cert_function(const ENGINE *e); */ ENGINE_FUNC(ENGINE_SSL_CLIENT_CERT_PTR, ENGINE_get_ssl_client_cert_function, - (const ENGINE *e), (e), NULL) + (const ENGINE *e), NULL) /* * OSSL_DEPRECATEDIN_3_0 * ENGINE_CIPHERS_PTR ENGINE_get_ciphers(const ENGINE *e); */ ENGINE_FUNC(ENGINE_CIPHERS_PTR, ENGINE_get_ciphers, - (const ENGINE *e), (e), NULL) + (const ENGINE *e), NULL) /* * OSSL_DEPRECATEDIN_3_0 * ENGINE_DIGESTS_PTR ENGINE_get_digests(const ENGINE *e); */ ENGINE_FUNC(ENGINE_DIGESTS_PTR, ENGINE_get_digests, - (const ENGINE *e), (e), NULL) + (const ENGINE *e), NULL) /* * OSSL_DEPRECATEDIN_3_0 * ENGINE_PKEY_METHS_PTR ENGINE_get_pkey_meths(const ENGINE *e); */ ENGINE_FUNC(ENGINE_PKEY_METHS_PTR, ENGINE_get_pkey_meths, - (const ENGINE *e), (e), NULL) + (const ENGINE *e), NULL) /* * OSSL_DEPRECATEDIN_3_0 * ENGINE_PKEY_ASN1_METHS_PTR ENGINE_get_pkey_asn1_meths(const ENGINE *e); */ ENGINE_FUNC(ENGINE_PKEY_ASN1_METHS_PTR, ENGINE_get_pkey_asn1_meths, - (const ENGINE *e), (e), NULL) + (const ENGINE *e), NULL) /* * OSSL_DEPRECATEDIN_3_0 * const EVP_CIPHER *ENGINE_get_cipher(ENGINE *e, int nid); */ ENGINE_FUNC(const EVP_CIPHER *, ENGINE_get_cipher, - (ENGINE *e, int nid), (e, nid), NULL) + (ENGINE *e, int nid), NULL) /* * OSSL_DEPRECATEDIN_3_0 * const EVP_MD *ENGINE_get_digest(ENGINE *e, int nid); */ ENGINE_FUNC(const EVP_MD *, ENGINE_get_digest, - (ENGINE *e, int nid), (e, nid), NULL) + (ENGINE *e, int nid), NULL) /* * OSSL_DEPRECATEDIN_3_0 * const EVP_PKEY_METHOD *ENGINE_get_pkey_meth(ENGINE *e, int nid); */ ENGINE_FUNC(const EVP_PKEY_METHOD *, ENGINE_get_pkey_meth, - (ENGINE *e, int nid), (e, nid), NULL) + (ENGINE *e, int nid), NULL) /* * OSSL_DEPRECATEDIN_3_0 * const EVP_PKEY_ASN1_METHOD *ENGINE_get_pkey_asn1_meth(ENGINE *e, int nid); */ ENGINE_FUNC(const EVP_PKEY_ASN1_METHOD *, ENGINE_get_pkey_asn1_meth, - (ENGINE *e, int nid), (e, nid), NULL) + (ENGINE *e, int nid), NULL) /* * OSSL_DEPRECATEDIN_3_0 * const EVP_PKEY_ASN1_METHOD *ENGINE_get_pkey_asn1_meth_str(ENGINE *e, * const char *str, int len); */ ENGINE_FUNC(const EVP_PKEY_ASN1_METHOD *, ENGINE_get_pkey_asn1_meth_str, - (ENGINE *e, const char *str, int len), (e, str, len), NULL) + (ENGINE *e, const char *str, int len), NULL) /* * OSSL_DEPRECATEDIN_3_0 * const EVP_PKEY_ASN1_METHOD *ENGINE_pkey_asn1_find_str(ENGINE **pe, * const char *str, int len); */ ENGINE_FUNC(const EVP_PKEY_ASN1_METHOD *, ENGINE_pkey_asn1_find_str, - (ENGINE **pe, const char *str, int len), (pe, str, len), NULL) + (ENGINE **pe, const char *str, int len), NULL) /* * OSSL_DEPRECATEDIN_3_0 * const ENGINE_CMD_DEFN *ENGINE_get_cmd_defns(const ENGINE *e); */ ENGINE_FUNC(const ENGINE_CMD_DEFN *, ENGINE_get_cmd_defns, - (const ENGINE *e), (e), NULL) + (const ENGINE *e), NULL) /* OSSL_DEPRECATEDIN_3_0 int ENGINE_get_flags(const ENGINE *e); */ -ENGINE_FUNC(int, ENGINE_get_flags, (const ENGINE *e), (e), 0) +ENGINE_FUNC(int, ENGINE_get_flags, (const ENGINE *e), 0) # endif /* @@ -921,7 +904,7 @@ ENGINE_FUNC(int, ENGINE_get_flags, (const ENGINE *e), (e), 0) */ # ifndef OPENSSL_NO_DEPRECATED_3_0 /* OSSL_DEPRECATEDIN_3_0 int ENGINE_init(ENGINE *e); */ -ENGINE_FUNC(int, ENGINE_init, (ENGINE *e), (e), 0) +ENGINE_FUNC(int, ENGINE_init, (ENGINE *e), 0) # endif /* * Free a functional reference to an engine type. This does not require a @@ -930,7 +913,7 @@ ENGINE_FUNC(int, ENGINE_init, (ENGINE *e), (e), 0) */ # ifndef OPENSSL_NO_DEPRECATED_3_0 /* OSSL_DEPRECATEDIN_3_0 int ENGINE_finish(ENGINE *e); */ -ENGINE_FUNC(int, ENGINE_finish, (ENGINE *e), (e), 0) +ENGINE_FUNC(int, ENGINE_finish, (ENGINE *e), 0) # endif /* @@ -946,8 +929,7 @@ ENGINE_FUNC(int, ENGINE_finish, (ENGINE *e), (e), 0) */ ENGINE_FUNC(EVP_PKEY *, ENGINE_load_private_key, (ENGINE *e, const char *key_id, UI_METHOD *ui_method, - void *callback_data), - (e, key_id, ui_method, callback_data), NULL) + void *callback_data), NULL) /* * OSSL_DEPRECATEDIN_3_0 * EVP_PKEY *ENGINE_load_public_key(ENGINE *e, const char *key_id, @@ -955,8 +937,7 @@ ENGINE_FUNC(EVP_PKEY *, ENGINE_load_private_key, */ ENGINE_FUNC(EVP_PKEY *, ENGINE_load_public_key, (ENGINE *e, const char *key_id, UI_METHOD *ui_method, - void *callback_data), - (e, key_id, ui_method, callback_data), NULL) + void *callback_data), NULL) /* * OSSL_DEPRECATEDIN_3_0 * int ENGINE_load_ssl_client_cert(ENGINE *e, SSL *s, STACK_OF(X509_NAME) *ca_dn, @@ -967,8 +948,7 @@ ENGINE_FUNC(EVP_PKEY *, ENGINE_load_public_key, ENGINE_FUNC(int, ENGINE_load_ssl_client_cert, (ENGINE *e, SSL *s, STACK_OF(X509_NAME) *ca_dn, X509 **pcert, EVP_PKEY **ppkey, STACK_OF(X509) **pother, UI_METHOD *ui_method, - void *callback_data), - (e, s, ca_dn, pcert, ppkey, pother, ui_method, callback_data), 0) + void *callback_data), 0) # endif /* @@ -998,13 +978,13 @@ ENGINE_FUNC_NOARGS(ENGINE *, ENGINE_get_default_RAND, NULL) */ # ifndef OPENSSL_NO_DEPRECATED_3_0 /* OSSL_DEPRECATEDIN_3_0 ENGINE *ENGINE_get_cipher_engine(int nid); */ -ENGINE_FUNC(ENGINE *, ENGINE_get_cipher_engine, (int nid), (nid), NULL) +ENGINE_FUNC(ENGINE *, ENGINE_get_cipher_engine, (int nid), NULL) /* OSSL_DEPRECATEDIN_3_0 ENGINE *ENGINE_get_digest_engine(int nid); */ -ENGINE_FUNC(ENGINE *, ENGINE_get_digest_engine, (int nid), (nid), NULL) +ENGINE_FUNC(ENGINE *, ENGINE_get_digest_engine, (int nid), NULL) /* OSSL_DEPRECATEDIN_3_0 ENGINE *ENGINE_get_pkey_meth_engine(int nid); */ -ENGINE_FUNC(ENGINE *, ENGINE_get_pkey_meth_engine, (int nid), (nid), NULL) +ENGINE_FUNC(ENGINE *, ENGINE_get_pkey_meth_engine, (int nid), NULL) /* OSSL_DEPRECATEDIN_3_0 ENGINE *ENGINE_get_pkey_asn1_meth_engine(int nid); */ -ENGINE_FUNC(ENGINE *, ENGINE_get_pkey_asn1_meth_engine, (int nid), (nid), NULL) +ENGINE_FUNC(ENGINE *, ENGINE_get_pkey_asn1_meth_engine, (int nid), NULL) # endif /* @@ -1015,32 +995,31 @@ ENGINE_FUNC(ENGINE *, ENGINE_get_pkey_asn1_meth_engine, (int nid), (nid), NULL) */ # ifndef OPENSSL_NO_DEPRECATED_3_0 /* OSSL_DEPRECATEDIN_3_0 int ENGINE_set_default_RSA(ENGINE *e); */ -ENGINE_FUNC(int, ENGINE_set_default_RSA, (ENGINE *e), (e), 0) +ENGINE_FUNC(int, ENGINE_set_default_RSA, (ENGINE *e), 0) /* * OSSL_DEPRECATEDIN_3_0 int ENGINE_set_default_string(ENGINE *e, * const char *def_list); */ -ENGINE_FUNC(int, ENGINE_set_default_string, (ENGINE *e, const char *def_list), - (e, def_list), 0) +ENGINE_FUNC(int, ENGINE_set_default_string, (ENGINE *e, const char *def_list), 0) # endif /* Same for the other "methods" */ # ifndef OPENSSL_NO_DEPRECATED_3_0 /* OSSL_DEPRECATEDIN_3_0 int ENGINE_set_default_DSA(ENGINE *e); */ -ENGINE_FUNC(int, ENGINE_set_default_DSA, (ENGINE *e), (e), 0) +ENGINE_FUNC(int, ENGINE_set_default_DSA, (ENGINE *e), 0) /* OSSL_DEPRECATEDIN_3_0 int ENGINE_set_default_EC(ENGINE *e); */ -ENGINE_FUNC(int, ENGINE_set_default_EC, (ENGINE *e), (e), 0) +ENGINE_FUNC(int, ENGINE_set_default_EC, (ENGINE *e), 0) /* OSSL_DEPRECATEDIN_3_0 int ENGINE_set_default_DH(ENGINE *e); */ -ENGINE_FUNC(int, ENGINE_set_default_DH, (ENGINE *e), (e), 0) +ENGINE_FUNC(int, ENGINE_set_default_DH, (ENGINE *e), 0) /* OSSL_DEPRECATEDIN_3_0 int ENGINE_set_default_RAND(ENGINE *e); */ -ENGINE_FUNC(int, ENGINE_set_default_RAND, (ENGINE *e), (e), 0) +ENGINE_FUNC(int, ENGINE_set_default_RAND, (ENGINE *e), 0) /* OSSL_DEPRECATEDIN_3_0 int ENGINE_set_default_ciphers(ENGINE *e); */ -ENGINE_FUNC(int, ENGINE_set_default_ciphers, (ENGINE *e), (e), 0) +ENGINE_FUNC(int, ENGINE_set_default_ciphers, (ENGINE *e), 0) /* OSSL_DEPRECATEDIN_3_0 int ENGINE_set_default_digests(ENGINE *e); */ -ENGINE_FUNC(int, ENGINE_set_default_digests, (ENGINE *e), (e), 0) +ENGINE_FUNC(int, ENGINE_set_default_digests, (ENGINE *e), 0) /* OSSL_DEPRECATEDIN_3_0 int ENGINE_set_default_pkey_meths(ENGINE *e); */ -ENGINE_FUNC(int, ENGINE_set_default_pkey_meths, (ENGINE *e), (e), 0) +ENGINE_FUNC(int, ENGINE_set_default_pkey_meths, (ENGINE *e), 0) /* OSSL_DEPRECATEDIN_3_0 int ENGINE_set_default_pkey_asn1_meths(ENGINE *e); */ -ENGINE_FUNC(int, ENGINE_set_default_pkey_asn1_meths, (ENGINE *e), (e), 0) +ENGINE_FUNC(int, ENGINE_set_default_pkey_asn1_meths, (ENGINE *e), 0) # endif /* @@ -1055,8 +1034,7 @@ ENGINE_FUNC(int, ENGINE_set_default_pkey_asn1_meths, (ENGINE *e), (e), 0) * OSSL_DEPRECATEDIN_3_0 * int ENGINE_set_default(ENGINE *e, unsigned int flags); */ -ENGINE_FUNC(int, ENGINE_set_default, (ENGINE *e, unsigned int flags), - (e, flags), 0) +ENGINE_FUNC(int, ENGINE_set_default, (ENGINE *e, unsigned int flags), 0) /* OSSL_DEPRECATEDIN_3_0 void ENGINE_add_conf_module(void); */ ENGINE_VOID_FUNC_NOARGS(ENGINE_add_conf_module) # endif @@ -1173,47 +1151,45 @@ ENGINE_VOID_FUNC_NOARGS(ENGINE_setup_bsd_cryptodev) ENGINE_FUNC_NOARGS(int, ossl_err_load_ENGINE_strings, 1) /* int EVP_PKEY_set1_engine(EVP_PKEY *pkey, ENGINE *e); */ -ENGINE_FUNC(int, EVP_PKEY_set1_engine, (EVP_PKEY *pkey, ENGINE *e), (pkey, e), 0) +ENGINE_FUNC(int, EVP_PKEY_set1_engine, (EVP_PKEY *pkey, ENGINE *e), 0) /* ENGINE *EVP_PKEY_get0_engine(const EVP_PKEY *pkey); */ -ENGINE_FUNC(ENGINE *, EVP_PKEY_get0_engine, (const EVP_PKEY *pkey), (pkey), NULL) +ENGINE_FUNC(ENGINE *, EVP_PKEY_get0_engine, (const EVP_PKEY *pkey), NULL) /* ENGINE *DH_get0_engine(DH *d); */ -ENGINE_FUNC(ENGINE *, DH_get0_engine, (DH *d), (d), NULL) +ENGINE_FUNC(ENGINE *, DH_get0_engine, (DH *d), NULL) /* ENGINE *RSA_get0_engine(const RSA *r); */ -ENGINE_FUNC(ENGINE *, RSA_get0_engine, (const RSA *r), (r), NULL) +ENGINE_FUNC(ENGINE *, RSA_get0_engine, (const RSA *r), NULL) /* ENGINE *DSA_get0_engine(DSA *d); */ -ENGINE_FUNC(ENGINE *, DSA_get0_engine, (DSA *d), (d), NULL) +ENGINE_FUNC(ENGINE *, DSA_get0_engine, (DSA *d), NULL) /* ENGINE *EC_KEY_get0_engine(const EC_KEY *eckey); */ -ENGINE_FUNC(ENGINE *, EC_KEY_get0_engine, (const EC_KEY *eckey), (eckey), NULL) +ENGINE_FUNC(ENGINE *, EC_KEY_get0_engine, (const EC_KEY *eckey), NULL) /* const ENGINE *OSSL_STORE_LOADER_get0_engine(const OSSL_STORE_LOADER *loader); */ ENGINE_FUNC(const ENGINE *, OSSL_STORE_LOADER_get0_engine, (const OSSL_STORE_LOADER *loader), - (loader), NULL) + NULL) /* int RAND_set_rand_engine(ENGINE *engine); */ -ENGINE_FUNC(int, RAND_set_rand_engine, (ENGINE *engine), (engine), 0) +ENGINE_FUNC(int, RAND_set_rand_engine, (ENGINE *engine), 0) /* * int TS_CONF_set_crypto_device(CONF *conf, const char *section, * const char *device); */ ENGINE_FUNC(int, TS_CONF_set_crypto_device, - (CONF *conf, const char *section, const char *device), - (conf, section, device), 0) + (CONF *conf, const char *section, const char *device), 0) /* int TS_CONF_set_default_engine(const char *name); */ -ENGINE_FUNC(int, TS_CONF_set_default_engine, (const char *name), (name), 0) +ENGINE_FUNC(int, TS_CONF_set_default_engine, (const char *name), 0) /* int ERR_load_ENGINE_strings(void); */ ENGINE_FUNC_NOARGS(int, ERR_load_ENGINE_strings, 1) /* int SSL_CTX_set_client_cert_engine(SSL_CTX *ctx, ENGINE *e); */ -ENGINE_FUNC(int, SSL_CTX_set_client_cert_engine, (SSL_CTX *ctx, ENGINE *e), - (ctx, e), 0) +ENGINE_FUNC(int, SSL_CTX_set_client_cert_engine, (SSL_CTX *ctx, ENGINE *e), 0) # ifdef __cplusplus }