Update symbols after OPENSSL_NO_ENGINE clearup

Signed-off-by: Norbert Pocs <norbertp@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/28384)

diff --git a/doc/man3/EVP_PKEY_set1_RSA.pod b/doc/man3/EVP_PKEY_set1_RSA.pod
index 6489b1189403b40acf38523a8b74051db0ee54d4..0a3c83447f6eb9e0136316aadc00c228f54c0086 100644 (file)
--- a/doc/man3/EVP_PKEY_set1_RSA.pod
+++ b/doc/man3/EVP_PKEY_set1_RSA.pod
@@ -9,7 +9,6 @@ EVP_PKEY_assign_RSA, EVP_PKEY_assign_DSA, EVP_PKEY_assign_DH,
 EVP_PKEY_assign_EC_KEY, EVP_PKEY_assign_POLY1305, EVP_PKEY_assign_SIPHASH,
 EVP_PKEY_get0_hmac, EVP_PKEY_get0_poly1305, EVP_PKEY_get0_siphash,
 EVP_PKEY_get0, EVP_PKEY_type, EVP_PKEY_get_id, EVP_PKEY_get_base_id,
-EVP_PKEY_set1_engine, EVP_PKEY_get0_engine,
 EVP_PKEY_id, EVP_PKEY_base_id -
 EVP_PKEY assignment functions
 
@@ -54,9 +53,6 @@ see L<openssl_user_macros(7)>:
  int EVP_PKEY_assign_POLY1305(EVP_PKEY *pkey, ASN1_OCTET_STRING *key);
  int EVP_PKEY_assign_SIPHASH(EVP_PKEY *pkey, ASN1_OCTET_STRING *key);
 
- ENGINE *EVP_PKEY_get0_engine(const EVP_PKEY *pkey);
- int EVP_PKEY_set1_engine(EVP_PKEY *pkey, ENGINE *engine);
-
 =head1 DESCRIPTION
 
 EVP_PKEY_get_base_id() returns the type of I<pkey>. For example
@@ -126,16 +122,6 @@ the provider's key. Subsequent calls to EVP_PKEY_get1_RSA(),
 EVP_PKEY_get1_DSA(), EVP_PKEY_get1_DH() and EVP_PKEY_get1_EC_KEY() will always
 return the cached copy returned by the first call.
 
-EVP_PKEY_get0_engine() returns a reference to the ENGINE handling I<pkey>. This
-function is deprecated. Applications should use providers instead of engines
-(see L<provider(7)> for details).
-
-EVP_PKEY_set1_engine() sets the ENGINE handling I<pkey> to I<engine>. It
-must be called after the key algorithm and components are set up.
-If I<engine> does not include an B<EVP_PKEY_METHOD> for I<pkey> an
-error occurs. This function is deprecated. Applications should use providers
-instead of engines (see L<provider(7)> for details).
-
 =head1 WARNINGS
 
 The following functions are only reliable with B<EVP_PKEY>s that have
@@ -181,9 +167,6 @@ Previous versions of this document suggested using EVP_PKEY_type(pkey->type)
 to determine the type of a key. Since B<EVP_PKEY> is now opaque this
 is no longer possible: the equivalent is EVP_PKEY_get_base_id(pkey).
 
-EVP_PKEY_set1_engine() is typically used by an ENGINE returning an HSM
-key as part of its routine to load a private key.
-
 =head1 RETURN VALUES
 
 EVP_PKEY_set1_RSA(), EVP_PKEY_set1_DSA(), EVP_PKEY_set1_DH() and
@@ -200,8 +183,6 @@ and EVP_PKEY_assign_SIPHASH() return 1 for success and 0 for failure.
 EVP_PKEY_get_base_id(), EVP_PKEY_get_id() and EVP_PKEY_type() return a key
 type or B<NID_undef> (equivalently B<EVP_PKEY_NONE>) on error.
 
-EVP_PKEY_set1_engine() returns 1 for success and 0 for failure.
-
 =head1 SEE ALSO
 
 L<EVP_PKEY_new(3)>, L<SM2(7)>
@@ -217,8 +198,8 @@ EVP_PKEY_get1_RSA, EVP_PKEY_get1_DSA, EVP_PKEY_get1_DH, EVP_PKEY_get1_EC_KEY,
 EVP_PKEY_get0_RSA, EVP_PKEY_get0_DSA, EVP_PKEY_get0_DH, EVP_PKEY_get0_EC_KEY,
 EVP_PKEY_assign_RSA, EVP_PKEY_assign_DSA, EVP_PKEY_assign_DH,
 EVP_PKEY_assign_EC_KEY, EVP_PKEY_assign_POLY1305, EVP_PKEY_assign_SIPHASH,
-EVP_PKEY_get0_hmac, EVP_PKEY_get0_poly1305, EVP_PKEY_get0_siphash,
-EVP_PKEY_set1_engine and EVP_PKEY_get0_engine were deprecated in OpenSSL 3.0.
+EVP_PKEY_get0_hmac, EVP_PKEY_get0_poly1305 and EVP_PKEY_get0_siphash
+were deprecated in OpenSSL 3.0.
 
 The return value from EVP_PKEY_get0_RSA, EVP_PKEY_get0_DSA, EVP_PKEY_get0_DH,
 EVP_PKEY_get0_EC_KEY were made const in OpenSSL 3.0.

diff --git a/include/openssl/sslerr_legacy.h b/include/openssl/sslerr_legacy.h
index 4c353671c7e88469b23a178fa86b44824a654105..55d643df9384d20b341b2948632fe211ddab25dd 100644 (file)
--- a/include/openssl/sslerr_legacy.h
+++ b/include/openssl/sslerr_legacy.h
@@ -171,7 +171,6 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_SSL_strings(void);
 #  define SSL_F_SSL_CTX_NEW                                0
 #  define SSL_F_SSL_CTX_SET_ALPN_PROTOS                    0
 #  define SSL_F_SSL_CTX_SET_CIPHER_LIST                    0
-#  define SSL_F_SSL_CTX_SET_CLIENT_CERT_ENGINE             0
 #  define SSL_F_SSL_CTX_SET_CT_VALIDATION_CALLBACK         0
 #  define SSL_F_SSL_CTX_SET_SESSION_ID_CONTEXT             0
 #  define SSL_F_SSL_CTX_SET_SSL_VERSION                    0

diff --git a/util/libcrypto.num b/util/libcrypto.num
index 5b7e8241eeb143ff088d5d804427775c2d83bc26..a6fa0bb78d9beb2a9124eb859926640b1ad5980b 100644 (file)
--- a/util/libcrypto.num
+++ b/util/libcrypto.num
@@ -1520,7 +1520,6 @@ CMS_SignerInfo_sign                     1554      4_0_0   EXIST::FUNCTION:CMS
 ASN1_item_i2d_bio                       1555   4_0_0   EXIST::FUNCTION:
 EVP_CIPHER_CTX_get_block_size           1556   4_0_0   EXIST::FUNCTION:
 DIRECTORYSTRING_free                    1557   4_0_0   EXIST::FUNCTION:
-TS_CONF_set_default_engine              1558   4_0_0   EXIST::FUNCTION:ENGINE,TS
 BN_set_bit                              1559   4_0_0   EXIST::FUNCTION:
 EVP_MD_meth_set_app_datasize            1560   4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0
 DSO_free                                1561   4_0_0   EXIST::FUNCTION:
@@ -1745,7 +1744,6 @@ NAME_CONSTRAINTS_check                  1786      4_0_0   EXIST::FUNCTION:
 X509_CERT_AUX_it                        1787   4_0_0   EXIST::FUNCTION:
 X509_get_X509_PUBKEY                    1789   4_0_0   EXIST::FUNCTION:
 TXT_DB_create_index                     1790   4_0_0   EXIST::FUNCTION:
-RAND_set_rand_engine                    1791   4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
 X509_set_serialNumber                   1792   4_0_0   EXIST::FUNCTION:
 BN_mod_exp_mont_consttime               1793   4_0_0   EXIST::FUNCTION:
 X509V3_parse_list                       1794   4_0_0   EXIST::FUNCTION:
@@ -2354,7 +2352,6 @@ i2d_ECDSA_SIG                           2404      4_0_0   EXIST::FUNCTION:EC
 BIO_dump_indent                         2405   4_0_0   EXIST::FUNCTION:
 ENGINE_set_pkey_asn1_meths              2406   4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
 OPENSSL_gmtime_diff                     2407   4_0_0   EXIST::FUNCTION:
-TS_CONF_set_crypto_device               2408   4_0_0   EXIST::FUNCTION:ENGINE,TS
 COMP_CTX_get_method                     2409   4_0_0   EXIST::FUNCTION:COMP
 EC_GROUP_get_cofactor                   2410   4_0_0   EXIST::FUNCTION:EC
 EVP_rc5_32_12_16_ofb                    2411   4_0_0   EXIST::FUNCTION:RC5
@@ -3729,7 +3726,6 @@ i2d_IPAddressRange                      3813      4_0_0   EXIST::FUNCTION:RFC3779
 CMS_unsigned_add1_attr_by_txt           3814   4_0_0   EXIST::FUNCTION:CMS
 d2i_RSA_PUBKEY                          3815   4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0
 PKCS12_gen_mac                          3816   4_0_0   EXIST::FUNCTION:
-ERR_load_ENGINE_strings                 3817   4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
 ERR_load_CT_strings                     3818   4_0_0   EXIST::FUNCTION:CT,DEPRECATEDIN_3_0
 OCSP_ONEREQ_it                          3819   4_0_0   EXIST::FUNCTION:OCSP
 X509_PURPOSE_get_by_sname               3820   4_0_0   EXIST::FUNCTION:
@@ -4232,7 +4228,6 @@ EVP_PKEY_meth_set_check                 4341      4_0_0   EXIST::FUNCTION:DEPRECATEDIN_
 EVP_PKEY_meth_get_check                 4342   4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0
 EVP_PKEY_meth_remove                    4343   4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0
 OPENSSL_sk_reserve                      4344   4_0_0   EXIST::FUNCTION:
-EVP_PKEY_set1_engine                    4347   4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
 DH_new_by_nid                           4348   4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,DH
 DH_get_nid                              4349   4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,DH
 CRYPTO_get_alloc_counts                 4350   4_0_0   EXIST::FUNCTION:CRYPTO_MDEBUG
@@ -4582,7 +4577,6 @@ OSSL_PARAM_get_octet_ptr                4709      4_0_0   EXIST::FUNCTION:
 OSSL_PARAM_set_octet_ptr                4710   4_0_0   EXIST::FUNCTION:
 X509_set0_distinguishing_id             4711   4_0_0   EXIST::FUNCTION:
 X509_get0_distinguishing_id             4712   4_0_0   EXIST::FUNCTION:
-EVP_PKEY_get0_engine                    4713   4_0_0   EXIST::FUNCTION:DEPRECATEDIN_3_0,ENGINE
 EVP_MD_up_ref                           4714   4_0_0   EXIST::FUNCTION:
 EVP_MD_fetch                            4715   4_0_0   EXIST::FUNCTION:
 EVP_set_default_properties              4716   4_0_0   EXIST::FUNCTION:

diff --git a/util/libssl.num b/util/libssl.num
index 54c465160aed8b8af3a5b8a656879301f63d93cf..3f8e4bf4efa9ef2f8b3ea7f2979f8f490375c5a6 100644 (file)
--- a/util/libssl.num
+++ b/util/libssl.num
@@ -228,7 +228,6 @@ SSL_get_current_compression             228 4_0_0   EXIST::FUNCTION:
 SSL_SESSION_has_ticket                  229    4_0_0   EXIST::FUNCTION:
 SSL_CTX_set_cert_verify_callback        230    4_0_0   EXIST::FUNCTION:
 SSL_set_session_secret_cb               231    4_0_0   EXIST::FUNCTION:
-SSL_CTX_set_client_cert_engine          232    4_0_0   EXIST::FUNCTION:ENGINE
 SSL_CTX_get0_param                      233    4_0_0   EXIST::FUNCTION:
 SSL_CTX_set1_param                      234    4_0_0   EXIST::FUNCTION:
 SSL_get_certificate                     235    4_0_0   EXIST::FUNCTION: