Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding stubs required for latest nginx #7449

Merged
merged 2 commits into from
Apr 19, 2024
Merged

Adding stubs required for latest nginx #7449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a1cf316
Adding stubs required for latest nginx
Apr 18, 2024
7a7af18
Guard with OPENSSL_EXTRA instead of WOLFSSL_NGINX
Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions src/conf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1599,4 +1599,33 @@ int wolfSSL_CONF_cmd_value_type(WOLFSSL_CONF_CTX *cctx, const char *cmd)
* END OF CONF API
******************************************************************************/

#if defined(OPENSSL_EXTRA)
OPENSSL_INIT_SETTINGS* wolfSSL_OPENSSL_INIT_new(void)
{
OPENSSL_INIT_SETTINGS* init = (OPENSSL_INIT_SETTINGS*)XMALLOC(
sizeof(OPENSSL_INIT_SETTINGS), NULL, DYNAMIC_TYPE_OPENSSL);

return init;
}

void wolfSSL_OPENSSL_INIT_free(OPENSSL_INIT_SETTINGS* init)
{
XFREE(init, NULL, DYNAMIC_TYPE_OPENSSL);
}

#ifndef NO_WOLFSSL_STUB
int wolfSSL_OPENSSL_INIT_set_config_appname(OPENSSL_INIT_SETTINGS* init,
char* appname)
{
(void)init;
(void)appname;
WOLFSSL_STUB("OPENSSL_INIT_set_config_appname");
return WOLFSSL_SUCCESS;
}
#endif

#endif /* OPENSSL_EXTRA */



#endif /* WOLFSSL_CONF_INCLUDED */
4 changes: 4 additions & 0 deletions wolfssl/openssl/ssl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1337,6 +1337,10 @@ typedef WOLFSSL_SRTP_PROTECTION_PROFILE SRTP_PROTECTION_PROFILE;
#define SSL_CONF_TYPE_FILE WOLFSSL_CONF_TYPE_FILE
#define SSL_CONF_TYPE_DIR WOLFSSL_CONF_TYPE_DIR

#define OPENSSL_INIT_new wolfSSL_OPENSSL_INIT_new
#define OPENSSL_INIT_free wolfSSL_OPENSSL_INIT_free
#define OPENSSL_INIT_set_config_appname wolfSSL_OPENSSL_INIT_set_config_appname

#if defined(HAVE_STUNNEL) || defined(WOLFSSL_NGINX) || \
defined(WOLFSSL_HAPROXY) || defined(OPENSSL_EXTRA) || defined(OPENSSL_ALL)

Expand Down
4 changes: 4 additions & 0 deletions wolfssl/ssl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5011,6 +5011,10 @@ 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);
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
#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L
WOLFSSL_API int wolfSSL_SSL_in_init(const WOLFSSL* ssl);
Expand Down