feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Guard with OPENSSL_EXTRA instead of WOLFSSL_NGINX

Browse Source
This commit is contained in:
Lealem Amedie
2024-04-18 16:33:37 -06:00
parent a1cf316630
commit 7a7af18887
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/conf.c
View File

@@ -1599,7 +1599,7 @@ int wolfSSL_CONF_cmd_value_type(WOLFSSL_CONF_CTX *cctx, const char *cmd)
* END OF CONF API * END OF CONF API
******************************************************************************/ ******************************************************************************/
#if defined(WOLFSSL_NGINX) #if defined(OPENSSL_EXTRA)
OPENSSL_INIT_SETTINGS* wolfSSL_OPENSSL_INIT_new(void) OPENSSL_INIT_SETTINGS* wolfSSL_OPENSSL_INIT_new(void)
{ {
OPENSSL_INIT_SETTINGS* init = (OPENSSL_INIT_SETTINGS*)XMALLOC( 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
#endif /* WOLFSSL_NGINX */ #endif /* OPENSSL_EXTRA */

2
wolfssl/ssl.h
View File

@@ -5011,13 +5011,11 @@ WOLFSSL_API int wolfSSL_SSL_do_handshake(WOLFSSL *s);
#ifdef OPENSSL_EXTRA #ifdef OPENSSL_EXTRA
WOLFSSL_API int wolfSSL_OPENSSL_init_ssl(word64 opts, WOLFSSL_API int wolfSSL_OPENSSL_init_ssl(word64 opts,
const OPENSSL_INIT_SETTINGS *settings); const OPENSSL_INIT_SETTINGS *settings);
#ifdef WOLFSSL_NGINX
WOLFSSL_API OPENSSL_INIT_SETTINGS* wolfSSL_OPENSSL_INIT_new(void); WOLFSSL_API OPENSSL_INIT_SETTINGS* wolfSSL_OPENSSL_INIT_new(void);
WOLFSSL_API void wolfSSL_OPENSSL_INIT_free(OPENSSL_INIT_SETTINGS* init); WOLFSSL_API void wolfSSL_OPENSSL_INIT_free(OPENSSL_INIT_SETTINGS* init);
WOLFSSL_API int wolfSSL_OPENSSL_INIT_set_config_appname( WOLFSSL_API int wolfSSL_OPENSSL_INIT_set_config_appname(
OPENSSL_INIT_SETTINGS* init, char* appname); OPENSSL_INIT_SETTINGS* init, char* appname);
#endif #endif
#endif
#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L #if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L
WOLFSSL_API int wolfSSL_SSL_in_init(const WOLFSSL* ssl); WOLFSSL_API int wolfSSL_SSL_in_init(const WOLFSSL* ssl);
#else #else