Merge pull request #8258 from dgarske/get_verify

Expose compatibility get_verify functions with openssl_extra
This commit is contained in:
JacobBarthelmeh
2024-12-05 17:08:59 -07:00
committed by GitHub
3 changed files with 9 additions and 9 deletions

View File

@ -20888,11 +20888,12 @@ WOLFSSL_CTX* wolfSSL_get_SSL_CTX(const WOLFSSL* ssl)
return ssl->ctx; return ssl->ctx;
} }
#if defined(OPENSSL_ALL) || (defined(OPENSSL_EXTRA) && defined(HAVE_STUNNEL)) \ #if defined(OPENSSL_ALL) || defined(OPENSSL_EXTRA) || defined(HAVE_STUNNEL) || \
|| defined(WOLFSSL_MYSQL_COMPATIBLE) || defined(WOLFSSL_NGINX) defined(WOLFSSL_MYSQL_COMPATIBLE) || defined(WOLFSSL_NGINX)
/* TODO: Doesn't currently track SSL_VERIFY_CLIENT_ONCE */ /* TODO: Doesn't currently track SSL_VERIFY_CLIENT_ONCE */
int wolfSSL_get_verify_mode(const WOLFSSL* ssl) { int wolfSSL_get_verify_mode(const WOLFSSL* ssl)
{
int mode = 0; int mode = 0;
WOLFSSL_ENTER("wolfSSL_get_verify_mode"); WOLFSSL_ENTER("wolfSSL_get_verify_mode");

View File

@ -72908,7 +72908,9 @@ static int test_wolfSSL_sk_DIST_POINT(void)
static int test_wolfSSL_verify_mode(void) static int test_wolfSSL_verify_mode(void)
{ {
EXPECT_DECLS; EXPECT_DECLS;
#if defined(OPENSSL_ALL) && !defined(NO_RSA) #if !defined(NO_RSA) && (defined(OPENSSL_ALL) || \
defined(HAVE_STUNNEL) || defined(WOLFSSL_MYSQL_COMPATIBLE) || \
defined(WOLFSSL_NGINX) || defined(WOLFSSL_HAPROXY))
WOLFSSL* ssl = NULL; WOLFSSL* ssl = NULL;
WOLFSSL_CTX* ctx = NULL; WOLFSSL_CTX* ctx = NULL;

View File

@ -5427,13 +5427,10 @@ WOLFSSL_API int wolfSSL_CTX_set1_curves_list(WOLFSSL_CTX* ctx, const char* names
WOLFSSL_API int wolfSSL_set1_curves_list(WOLFSSL* ssl, const char* names); WOLFSSL_API int wolfSSL_set1_curves_list(WOLFSSL* ssl, const char* names);
#endif #endif
#if defined(OPENSSL_ALL) || \ #if defined(OPENSSL_ALL) || defined(OPENSSL_EXTRA) || defined(HAVE_STUNNEL) || \
defined(HAVE_STUNNEL) || defined(WOLFSSL_MYSQL_COMPATIBLE) || \ defined(WOLFSSL_MYSQL_COMPATIBLE) || defined(WOLFSSL_NGINX)
defined(WOLFSSL_NGINX) || defined(WOLFSSL_HAPROXY)
WOLFSSL_API int wolfSSL_get_verify_mode(const WOLFSSL* ssl); WOLFSSL_API int wolfSSL_get_verify_mode(const WOLFSSL* ssl);
WOLFSSL_API int wolfSSL_CTX_get_verify_mode(const WOLFSSL_CTX* ctx); WOLFSSL_API int wolfSSL_CTX_get_verify_mode(const WOLFSSL_CTX* ctx);
#endif #endif
#ifdef WOLFSSL_JNI #ifdef WOLFSSL_JNI