From: Matt Caswell <matt@openssl.org>
Date: Wed, 25 Feb 2015 11:30:43 +0000 (+0000)
Subject: Fix bug in s_client. Previously default verify locations would only be loaded
X-Git-Tag: OpenSSL_1_0_1n~109
X-Git-Url: https://git.openssl.org/gitweb/?a=commitdiff_plain;h=fe9b85c3cb79f1e29e61f01de105b34ce8177190;p=openssl.git

Fix bug in s_client. Previously default verify locations would only be loaded
if CAfile or CApath were also supplied and successfully loaded first.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(cherry picked from commit 70e5fd877890489a3972bf8bf50bfec1fca3875e)
---

diff --git a/apps/s_client.c b/apps/s_client.c
index ef41cec1aa..1f37239e27 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -1177,13 +1177,12 @@ int MAIN(int argc, char **argv)
     if (!set_cert_key_stuff(ctx, cert, key))
         goto end;
 
-    if ((!SSL_CTX_load_verify_locations(ctx, CAfile, CApath)) ||
-        (!SSL_CTX_set_default_verify_paths(ctx))) {
-        /*
-         * BIO_printf(bio_err,"error setting default verify locations\n");
-         */
+    if ((CAfile || CApath)
+        && !SSL_CTX_load_verify_locations(ctx, CAfile, CApath)) {
+        ERR_print_errors(bio_err);
+    }
+    if (!SSL_CTX_set_default_verify_paths(ctx)) {
         ERR_print_errors(bio_err);
-        /* goto end; */
     }
 #ifndef OPENSSL_NO_TLSEXT
     if (servername != NULL) {