Fix stub definitions for no-deprecated config

Used types are only available if OPENSSL_NO_DEPRECATED_3_0
is not defined.

Signed-off-by: Milan Broz <gmazyland@gmail.com>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Norbert Pocs <norbertp@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/29414)

diff --git a/include/openssl/engine.h b/include/openssl/engine.h
index 2586c2eb99191b2c4a26c3e8d0ae3a43ee4201d1..22b41a3ebed39c9a88e057b7d5448ecef19b7ba9 100644 (file)
--- a/include/openssl/engine.h
+++ b/include/openssl/engine.h
@@ -1151,6 +1151,7 @@ ENGINE_VOID_FUNC_NOARGS(ENGINE_setup_bsd_cryptodev)
 /* int ossl_err_load_ENGINE_strings(void); */
 ENGINE_FUNC_NOARGS(int, ossl_err_load_ENGINE_strings, 1)
 
+#ifndef OPENSSL_NO_DEPRECATED_3_0
 /* int EVP_PKEY_set1_engine(EVP_PKEY *pkey, ENGINE *e); */
 ENGINE_FUNC(int, EVP_PKEY_set1_engine, (EVP_PKEY *pkey, ENGINE *e), 0)
 
@@ -1176,6 +1177,10 @@ ENGINE_FUNC(const ENGINE *, OSSL_STORE_LOADER_get0_engine, (const OSSL_STORE_LOA
 /* int RAND_set_rand_engine(ENGINE *engine); */
 ENGINE_FUNC(int, RAND_set_rand_engine, (ENGINE *engine), 0)
 
+/* int ERR_load_ENGINE_strings(void); */
+ENGINE_FUNC_NOARGS(int, ERR_load_ENGINE_strings, 1)
+#endif
+
 /*
  * int TS_CONF_set_crypto_device(CONF *conf, const char *section,
  *                              const char *device);
@@ -1186,9 +1191,6 @@ ENGINE_FUNC(int, TS_CONF_set_crypto_device,
 /* int TS_CONF_set_default_engine(const char *name); */
 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), 0)