aboutsummaryrefslogtreecommitdiff
path: root/apps/s_server.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2016-05-23 18:13:16 +0100
committerDr. Stephen Henson <steve@openssl.org>2016-05-23 19:15:20 +0100
commitf65a8c1e66f43b642d5d1709a933615aac62cebd (patch)
tree9ee0f1f392ea09ec837399c2346275a7b83a6ab3 /apps/s_server.c
parent77ab2b0193a5b53112af3e99409e3ac57e6b5555 (diff)
downloadopenssl-f65a8c1e66f43b642d5d1709a933615aac62cebd.zip
openssl-f65a8c1e66f43b642d5d1709a933615aac62cebd.tar.gz
openssl-f65a8c1e66f43b642d5d1709a933615aac62cebd.tar.bz2
Support -no-CAfile -no-CApath in ctx2
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Diffstat (limited to 'apps/s_server.c')
-rw-r--r--apps/s_server.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/s_server.c b/apps/s_server.c
index dd12475..35baac9 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");