Allow using wolfSSL_CTX_set_default_verify_paths without WOLFSSL_SYS_CA_CERTS defined.

This commit is contained in:
Kareem
2024-04-19 12:21:57 -07:00
parent 21058820fb
commit c1f23cc505

View File

@ -5026,8 +5026,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
@ -5086,7 +5084,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) {
@ -5095,6 +5093,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
} }
@ -5103,8 +5105,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