Support -no-CAfile -no-CApath in ctx2

[openssl.git] / apps / s_server.c

diff --git a/apps/s_server.c b/apps/s_server.c
index dd1247586950067acbaafba8d369a918b44c6d6b..35baac91d9161e7b67c0f1755918ee006ba5fc82 100644 (file)
--- 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 (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);
             ERR_print_errors(bio_err);

+            goto end;

         }
         if (vpmtouched && !SSL_CTX_set1_param(ctx2, vpm)) {
             BIO_printf(bio_err, "Error setting verify params\n");
         }
         if (vpmtouched && !SSL_CTX_set1_param(ctx2, vpm)) {
             BIO_printf(bio_err, "Error setting verify params\n");