aboutsummaryrefslogtreecommitdiffstats
path: root/apps/s_server.c
diff options
context:
space:
mode:
authorViktor Dukhovni <openssl-users@dukhovni.org>2016-01-16 00:08:38 -0500
committerViktor Dukhovni <openssl-users@dukhovni.org>2016-01-20 19:04:26 -0500
commit0996dc5440cc233f029129182bbb6e3d4613045a (patch)
tree7b54822da3319212fc52d6b9e1d463c770fa0495 /apps/s_server.c
parent6e8beabcd4b9450a3a7358bf5668b2bc70580517 (diff)
downloadopenssl-0996dc5440cc233f029129182bbb6e3d4613045a.tar.gz
Refactor apps load_certs/load_crls to work incrementally
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'apps/s_server.c')
-rw-r--r--apps/s_server.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/apps/s_server.c b/apps/s_server.c
index 93f608319b..9d9cb241be 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -1507,9 +1507,8 @@ int s_server_main(int argc, char *argv[])
goto end;
}
if (s_chain_file) {
- s_chain = load_certs(s_chain_file, FORMAT_PEM,
- NULL, e, "server certificate chain");
- if (!s_chain)
+ if (!load_certs(s_chain_file, &s_chain, FORMAT_PEM, NULL, e,
+ "server certificate chain"))
goto end;
}
@@ -1587,9 +1586,8 @@ int s_server_main(int argc, char *argv[])
goto end;
}
if (s_dchain_file) {
- s_dchain = load_certs(s_dchain_file, FORMAT_PEM,
- NULL, e, "second server certificate chain");
- if (!s_dchain)
+ if (!load_certs(s_dchain_file, &s_dchain, FORMAT_PEM, NULL, e,
+ "second server certificate chain"))
goto end;
}