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

fixed NO_WOLFSSL_DIR configuration case

Browse Source
This commit is contained in:
Hideki Miyazaki
2021-03-18 16:44:38 +09:00
parent ffa6a80725
commit 300cbf7a5b
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ssl.c
View File

@@ -24985,7 +24985,8 @@ int wolfSSL_X509_LOOKUP_ctrl(WOLFSSL_X509_LOOKUP *ctx, int cmd,
#if !defined(NO_WOLFSSL_DIR) #if !defined(NO_WOLFSSL_DIR)
lret = x509AddCertDir(ctx->dirs, argc, argl); lret = x509AddCertDir(ctx->dirs, argc, argl);
#else #else
lret = WOLFSSL_NOT_IMPLEMENTED (void)x509AddCertDir;
lret = WOLFSSL_NOT_IMPLEMENTED;
#endif #endif
break; break;
case WOLFSSL_X509_L_ADD_STORE: case WOLFSSL_X509_L_ADD_STORE:

9
tests/api.c
View File

@@ -28925,7 +28925,8 @@ static void test_wolfSSL_X509_STORE(void)
static void test_wolfSSL_X509_STORE_load_locations(void) static void test_wolfSSL_X509_STORE_load_locations(void)
{ {
#if (defined(OPENSSL_ALL) || defined(WOLFSSL_APACHE_HTTPD)) && !defined(NO_FILESYSTEM) #if (defined(OPENSSL_ALL) || defined(WOLFSSL_APACHE_HTTPD)) && !defined(NO_FILESYSTEM)\
&& !defined(NO_WOLFSSL_DIR)
SSL_CTX *ctx; SSL_CTX *ctx;
X509_STORE *store; X509_STORE *store;
@@ -40867,7 +40868,7 @@ static void test_wolfSSL_X509_print(void)
!defined(NO_RSA) && !defined(HAVE_FAST_RSA) && defined(XSNPRINTF) !defined(NO_RSA) && !defined(HAVE_FAST_RSA) && defined(XSNPRINTF)
X509 *x509; X509 *x509;
BIO *bio; BIO *bio;
#ifdef OPENSSL_ALL #if defined(OPENSSL_ALL) && !defined(NO_WOLFSSL_DIR)
const X509_ALGOR *cert_sig_alg; const X509_ALGOR *cert_sig_alg;
#endif #endif
@@ -40888,14 +40889,16 @@ static void test_wolfSSL_X509_print(void)
AssertNotNull(bio = BIO_new_fd(STDOUT_FILENO, BIO_NOCLOSE)); AssertNotNull(bio = BIO_new_fd(STDOUT_FILENO, BIO_NOCLOSE));
#ifdef OPENSSL_ALL #if defined(OPENSSL_ALL) && !defined(NO_WOLFSSL_DIR)
/* Print signature */ /* Print signature */
AssertNotNull(cert_sig_alg = X509_get0_tbs_sigalg(x509)); AssertNotNull(cert_sig_alg = X509_get0_tbs_sigalg(x509));
AssertIntEQ(X509_signature_print(bio, cert_sig_alg, NULL), SSL_SUCCESS); AssertIntEQ(X509_signature_print(bio, cert_sig_alg, NULL), SSL_SUCCESS);
#endif #endif
/* print to stdout */ /* print to stdout */
#if !defined(NO_WOLFSSL_DIR)
AssertIntEQ(X509_print(bio, x509), SSL_SUCCESS); AssertIntEQ(X509_print(bio, x509), SSL_SUCCESS);
#endif
/* print again */ /* print again */
AssertIntEQ(X509_print_fp(stdout, x509), SSL_SUCCESS); AssertIntEQ(X509_print_fp(stdout, x509), SSL_SUCCESS);