From: Milan Broz Date: Tue, 16 Dec 2025 11:41:09 +0000 (+0100) Subject: Fix stub definitions for no-deprecated config X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=807fd8bc09d3e00492acfdb0ce3d02a1f3628bad;p=thirdparty%2Fopenssl.git 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 Reviewed-by: Matt Caswell Reviewed-by: Norbert Pocs Reviewed-by: Neil Horman (Merged from https://github.com/openssl/openssl/pull/29414) --- diff --git a/include/openssl/engine.h b/include/openssl/engine.h index 2586c2eb991..22b41a3ebed 100644 --- 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)