Remove ENGINE symbols from API.

Note, that engine.h now does not contain any real forward declarations,
so it should be excluded from the symbols parsing.

Signed-off-by: Milan Broz <gmazyland@gmail.com>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Norbert Pocs <norbertp@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/29305)

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index d9c4f319a970c2d9fa847a7deb7cffc3ba78a930..b6a78107668d341eb3e082cd1894e96603da5d3b 100644 (file)
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -1319,6 +1319,7 @@ errors:
    my @cryptoskipheaders = ( @sslheaders_tmpl,
        qw( include/openssl/conf_api.h
            include/openssl/ebcdic.h
+           include/openssl/engine.h
            include/openssl/opensslconf.h
            include/openssl/symhacks.h ) );
    our %cryptoheaders = ();

diff --git a/util/libcrypto.num b/util/libcrypto.num
index 874c22177eecbc729a5da7ca6f4dcef20cc2e7e4..0652b1233ad433150e476cd17549a2f996a66803 100644 (file)
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -826,128 +826,6 @@ OSSL_ENCODER_to_bio                     ? 4_0_0   EXIST::FUNCTION:
 OSSL_ENCODER_to_fp                      ?      4_0_0   EXIST::FUNCTION:STDIO
 OSSL_ENCODER_to_data                    ?      4_0_0   EXIST::FUNCTION:
 OSSL_ENCODER_CTX_new_for_pkey           ?      4_0_0   EXIST::FUNCTION:
-ENGINE_get_first                        ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_last                         ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_next                         ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_prev                         ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_add                              ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_remove                           ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_by_id                            ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_load_builtin_engines             ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_table_flags                  ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_set_table_flags                  ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_register_RSA                     ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_unregister_RSA                   ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_register_all_RSA                 ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_register_DSA                     ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_unregister_DSA                   ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_register_all_DSA                 ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_register_EC                      ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_unregister_EC                    ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_register_all_EC                  ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_register_DH                      ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_unregister_DH                    ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_register_all_DH                  ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_register_RAND                    ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_unregister_RAND                  ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_register_all_RAND                ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_register_ciphers                 ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_unregister_ciphers               ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_register_all_ciphers             ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_register_digests                 ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_unregister_digests               ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_register_all_digests             ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_register_pkey_meths              ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_unregister_pkey_meths            ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_register_all_pkey_meths          ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_register_pkey_asn1_meths         ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_unregister_pkey_asn1_meths       ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_register_all_pkey_asn1_meths     ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_register_complete                ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_register_all_complete            ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_ctrl                             ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_cmd_is_executable                ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_ctrl_cmd                         ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_ctrl_cmd_string                  ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_new                              ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_free                             ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_up_ref                           ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_set_id                           ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_set_name                         ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_set_RSA                          ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_set_DSA                          ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_set_EC                           ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_set_DH                           ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_set_RAND                         ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_set_destroy_function             ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_set_init_function                ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_set_finish_function              ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_set_ctrl_function                ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_set_load_privkey_function        ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_set_load_pubkey_function         ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_set_load_ssl_client_cert_function ?     4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_set_ciphers                      ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_set_digests                      ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_set_pkey_meths                   ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_set_pkey_asn1_meths              ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_set_flags                        ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_set_cmd_defns                    ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_set_ex_data                      ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_ex_data                      ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_id                           ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_name                         ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_RSA                          ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_DSA                          ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_EC                           ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_DH                           ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_RAND                         ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_destroy_function             ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_init_function                ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_finish_function              ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_ctrl_function                ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_load_privkey_function        ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_load_pubkey_function         ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_ssl_client_cert_function     ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_ciphers                      ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_digests                      ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_pkey_meths                   ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_pkey_asn1_meths              ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_cipher                       ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_digest                       ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_pkey_meth                    ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_pkey_asn1_meth               ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_pkey_asn1_meth_str           ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_pkey_asn1_find_str               ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_cmd_defns                    ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_flags                        ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_init                             ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_finish                           ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_load_private_key                 ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_load_public_key                  ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_load_ssl_client_cert             ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_default_RSA                  ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_default_DSA                  ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_default_EC                   ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_default_DH                   ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_default_RAND                 ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_cipher_engine                ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_digest_engine                ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_pkey_meth_engine             ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_pkey_asn1_meth_engine        ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_set_default_RSA                  ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_set_default_string               ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_set_default_DSA                  ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_set_default_EC                   ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_set_default_DH                   ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_set_default_RAND                 ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_set_default_ciphers              ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_set_default_digests              ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_set_default_pkey_meths           ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_set_default_pkey_asn1_meths      ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_set_default                      ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_add_conf_module                  ?      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
-ENGINE_get_static_state                 ?      4_0_0   EXIST::FUNCTION:ENGINE
-ENGINE_setup_bsd_cryptodev              ?      4_0_0   EXIST:__FreeBSD__:FUNCTION:DEPRECATEDIN_1_1_0,ENGINE
 EVP_set_default_properties              ?      4_0_0   EXIST::FUNCTION:
 EVP_get1_default_properties             ?      4_0_0   EXIST::FUNCTION:
 EVP_default_properties_is_fips_enabled  ?      4_0_0   EXIST::FUNCTION: