From 7a7af18887a92a8191661e460373848fe0b5830f Mon Sep 17 00:00:00 2001 From: Lealem Amedie Date: Thu, 18 Apr 2024 16:33:37 -0600 Subject: [PATCH] Guard with OPENSSL_EXTRA instead of WOLFSSL_NGINX --- src/conf.c | 4 ++-- wolfssl/ssl.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/conf.c b/src/conf.c index c0ec4ad2b..d177da5c7 100644 --- a/src/conf.c +++ b/src/conf.c @@ -1599,7 +1599,7 @@ int wolfSSL_CONF_cmd_value_type(WOLFSSL_CONF_CTX *cctx, const char *cmd) * END OF CONF API ******************************************************************************/ -#if defined(WOLFSSL_NGINX) +#if defined(OPENSSL_EXTRA) OPENSSL_INIT_SETTINGS* wolfSSL_OPENSSL_INIT_new(void) { OPENSSL_INIT_SETTINGS* init = (OPENSSL_INIT_SETTINGS*)XMALLOC( @@ -1624,7 +1624,7 @@ int wolfSSL_OPENSSL_INIT_set_config_appname(OPENSSL_INIT_SETTINGS* init, } #endif -#endif /* WOLFSSL_NGINX */ +#endif /* OPENSSL_EXTRA */ diff --git a/wolfssl/ssl.h b/wolfssl/ssl.h index 5b689411a..7c34c1c34 100644 --- a/wolfssl/ssl.h +++ b/wolfssl/ssl.h @@ -5011,13 +5011,11 @@ WOLFSSL_API int wolfSSL_SSL_do_handshake(WOLFSSL *s); #ifdef OPENSSL_EXTRA WOLFSSL_API int wolfSSL_OPENSSL_init_ssl(word64 opts, const OPENSSL_INIT_SETTINGS *settings); -#ifdef WOLFSSL_NGINX WOLFSSL_API OPENSSL_INIT_SETTINGS* wolfSSL_OPENSSL_INIT_new(void); WOLFSSL_API void wolfSSL_OPENSSL_INIT_free(OPENSSL_INIT_SETTINGS* init); WOLFSSL_API int wolfSSL_OPENSSL_INIT_set_config_appname( OPENSSL_INIT_SETTINGS* init, char* appname); #endif -#endif #if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L WOLFSSL_API int wolfSSL_SSL_in_init(const WOLFSSL* ssl); #else