From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 23 May 2016 17:13:16 +0000 (+0100)
Subject: Support -no-CAfile -no-CApath in ctx2
X-Git-Tag: OpenSSL_1_1_0-pre6~722
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f65a8c1e66f43b642d5d1709a933615aac62cebd;p=oweals%2Fopenssl.git

Support -no-CAfile -no-CApath in ctx2

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
---

diff --git a/apps/s_server.c b/apps/s_server.c
index dd12475869..35baac91d9 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -1760,9 +1760,10 @@ int s_server_main(int argc, char *argv[])
         if (async)
             SSL_CTX_set_mode(ctx2, SSL_MODE_ASYNC);
 
-        if ((!SSL_CTX_load_verify_locations(ctx2, CAfile, CApath)) ||
-            (!SSL_CTX_set_default_verify_paths(ctx2))) {
+        if (!ctx_set_verify_locations(ctx2, CAfile, CApath, noCAfile,
+                                      noCApath)) {
             ERR_print_errors(bio_err);
+            goto end;
         }
         if (vpmtouched && !SSL_CTX_set1_param(ctx2, vpm)) {
             BIO_printf(bio_err, "Error setting verify params\n");