Skip to content

Commit c1f23cc

Browse files
Allow using wolfSSL_CTX_set_default_verify_paths without WOLFSSL_SYS_CA_CERTS defined.
1 parent 2105882 commit c1f23cc

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

src/ssl_load.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5026,8 +5026,6 @@ int wolfSSL_CTX_use_RSAPrivateKey(WOLFSSL_CTX* ctx, WOLFSSL_RSA* rsa)
50265026

50275027
#ifdef OPENSSL_EXTRA
50285028

5029-
#ifdef WOLFSSL_SYS_CA_CERTS
5030-
50315029
/* Use the default paths to look for CA certificate.
50325030
*
50335031
* 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)
50865084
WOLFSSL_MSG("wolfSSL_CTX_set_default_verify_paths not supported"
50875085
" with NO_FILESYSTEM enabled");
50885086
ret = WOLFSSL_FATAL_ERROR;
5089-
#else
5087+
#elif defined(WOLFSSL_SYS_CA_CERTS)
50905088
/* Load the system CA certificates. */
50915089
ret = wolfSSL_CTX_load_system_CA_certs(ctx);
50925090
if (ret == WOLFSSL_BAD_PATH) {
@@ -5095,6 +5093,10 @@ int wolfSSL_CTX_set_default_verify_paths(WOLFSSL_CTX* ctx)
50955093
*/
50965094
ret = 1;
50975095
}
5096+
#else
5097+
/* OpenSSL's implementation of this API does not require loading the
5098+
system CA cert directory. Allow skipping this without erroring out. */
5099+
ret = 1;
50985100
#endif
50995101
}
51005102

@@ -5103,8 +5105,6 @@ int wolfSSL_CTX_set_default_verify_paths(WOLFSSL_CTX* ctx)
51035105
return ret;
51045106
}
51055107

5106-
#endif /* WOLFSSL_SYS_CA_CERTS */
5107-
51085108
#endif /* OPENSSL_EXTRA */
51095109

51105110
#ifndef NO_DH

0 commit comments

Comments
 (0)