diff options
| author | Tomas Mraz <tomas@openssl.org> | 2021-03-05 21:05:35 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-03-15 13:29:57 +0100 |
| commit | ea51096e51571b0dfe1e9e63661ad6f62ce0d82a (patch) | |
| tree | 58e1c359aaa08b76d7abf971e6c97d009da0e1b7 /apps/s_server.c | |
| parent | 8287a4c3b2230f8df109f5eb34171fa0058add2c (diff) | |
apps: Add maybe_stdin argument to load_certs and set it in pkcs12
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14449)
Diffstat (limited to 'apps/s_server.c')
| -rw-r--r-- | apps/s_server.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index bbbe3cf877..34b28736a1 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -1690,7 +1690,7 @@ int s_server_main(int argc, char *argv[]) if (s_cert == NULL) goto end; if (s_chain_file != NULL) { - if (!load_certs(s_chain_file, &s_chain, NULL, + if (!load_certs(s_chain_file, 0, &s_chain, NULL, "server certificate chain")) goto end; } @@ -1754,7 +1754,7 @@ int s_server_main(int argc, char *argv[]) goto end; } if (s_dchain_file != NULL) { - if (!load_certs(s_dchain_file, &s_dchain, NULL, + if (!load_certs(s_dchain_file, 0, &s_dchain, NULL, "second server certificate chain")) goto end; } |