From 681ecf0e582c412f2401c5c8dfd23956bb8ec789 Mon Sep 17 00:00:00 2001 From: Carie Pointer Date: Mon, 6 Jan 2020 14:32:32 -0800 Subject: [PATCH] Fixes for wolfSSL_CTX_load_verify_locations_ex --- src/ssl.c | 2 ++ wolfssl/openssl/ssl.h | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/src/ssl.c b/src/ssl.c index d8e087991..1a6851c3f 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -6798,6 +6798,8 @@ int wolfSSL_CTX_load_verify_locations_ex(WOLFSSL_CTX* ctx, const char* file, if (file) { ret = ProcessFile(ctx, file, WOLFSSL_FILETYPE_PEM, CA_TYPE, NULL, 0, NULL, verify); + if (ret == WOLFSSL_SUCCESS) + successCount++; } if (ret == WOLFSSL_SUCCESS && path) { diff --git a/wolfssl/openssl/ssl.h b/wolfssl/openssl/ssl.h index d7dbfcf3c..b2aafb9ad 100644 --- a/wolfssl/openssl/ssl.h +++ b/wolfssl/openssl/ssl.h @@ -210,7 +210,13 @@ typedef WOLFSSL_X509_VERIFY_PARAM X509_VERIFY_PARAM; #ifndef NO_FILESYSTEM #define SSL_CTX_use_certificate_file wolfSSL_CTX_use_certificate_file #define SSL_CTX_use_PrivateKey_file wolfSSL_CTX_use_PrivateKey_file +#ifdef WOLFSSL_APACHE_HTTPD + #define SSL_CTX_load_verify_locations(ctx,file,path) \ + wolfSSL_CTX_load_verify_locations_ex(ctx,file,path,\ + WOLFSSL_LOAD_FLAG_IGNORE_ERR) +#else #define SSL_CTX_load_verify_locations wolfSSL_CTX_load_verify_locations +#endif #define SSL_CTX_use_certificate_chain_file wolfSSL_CTX_use_certificate_chain_file #define SSL_CTX_use_RSAPrivateKey_file wolfSSL_CTX_use_RSAPrivateKey_file