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

Merge pull request #7441 from kareem-wolfssl/zd17857

Browse Source 
Allow using wolfSSL_CTX_set_default_verify_paths without WOLFSSL_SYS_CA_CERTS defined.
This commit is contained in:
Daniel Pouzzner
2024-05-09 00:38:04 -04:00
committed by GitHub
parent ac17616873 c1f23cc505
commit d53abc2e37
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ssl.c
View File

@@ -19614,7 +19614,7 @@ long wolfSSL_CTX_ctrl(WOLFSSL_CTX* ctx, int cmd, long opt, void* pt)
return ret; return ret;
} }
#ifndef WOLFSSL_NO_STUB #ifndef NO_WOLFSSL_STUB
long wolfSSL_CTX_callback_ctrl(WOLFSSL_CTX* ctx, int cmd, void (*fp)(void)) long wolfSSL_CTX_callback_ctrl(WOLFSSL_CTX* ctx, int cmd, void (*fp)(void))
{ {
(void) ctx; (void) ctx;
@@ -19624,7 +19624,7 @@ long wolfSSL_CTX_callback_ctrl(WOLFSSL_CTX* ctx, int cmd, void (*fp)(void))
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
#endif /* WOLFSSL_NO_STUB */ #endif /* NO_WOLFSSL_STUB */
#ifndef NO_WOLFSSL_STUB #ifndef NO_WOLFSSL_STUB
long wolfSSL_CTX_clear_extra_chain_certs(WOLFSSL_CTX* ctx) long wolfSSL_CTX_clear_extra_chain_certs(WOLFSSL_CTX* ctx)

10
src/ssl_load.c
View File

@@ -5029,8 +5029,6 @@ int wolfSSL_CTX_use_RSAPrivateKey(WOLFSSL_CTX* ctx, WOLFSSL_RSA* rsa)
#ifdef OPENSSL_EXTRA #ifdef OPENSSL_EXTRA
#ifdef WOLFSSL_SYS_CA_CERTS
/* Use the default paths to look for CA certificate. /* Use the default paths to look for CA certificate.
* *
* This is an OpenSSL compatibility layer function, but it doesn't mirror * This is an OpenSSL compatibility layer function, but it doesn't mirror
@@ -5089,7 +5087,7 @@ int wolfSSL_CTX_set_default_verify_paths(WOLFSSL_CTX* ctx)
WOLFSSL_MSG("wolfSSL_CTX_set_default_verify_paths not supported" WOLFSSL_MSG("wolfSSL_CTX_set_default_verify_paths not supported"
" with NO_FILESYSTEM enabled"); " with NO_FILESYSTEM enabled");
ret = WOLFSSL_FATAL_ERROR; ret = WOLFSSL_FATAL_ERROR;
#else #elif defined(WOLFSSL_SYS_CA_CERTS)
/* Load the system CA certificates. */ /* Load the system CA certificates. */
ret = wolfSSL_CTX_load_system_CA_certs(ctx); ret = wolfSSL_CTX_load_system_CA_certs(ctx);
if (ret == WOLFSSL_BAD_PATH) { if (ret == WOLFSSL_BAD_PATH) {
@@ -5098,6 +5096,10 @@ int wolfSSL_CTX_set_default_verify_paths(WOLFSSL_CTX* ctx)
*/ */
ret = 1; ret = 1;
} }
#else
/* OpenSSL's implementation of this API does not require loading the
system CA cert directory. Allow skipping this without erroring out. */
ret = 1;
#endif #endif
} }
@@ -5106,8 +5108,6 @@ int wolfSSL_CTX_set_default_verify_paths(WOLFSSL_CTX* ctx)
return ret; return ret;
} }
#endif /* WOLFSSL_SYS_CA_CERTS */
#endif /* OPENSSL_EXTRA */ #endif /* OPENSSL_EXTRA */
#ifndef NO_DH #ifndef NO_DH