diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-10-24 16:31:57 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-10-26 09:43:39 +0100 |
| commit | 22dddfb925da8775eaf4ee8c377da41e6535afe1 (patch) | |
| tree | 86eae67fce686dd241e2540b7b03b42b247f7918 /apps/s_server.c | |
| parent | b6120b5f5442c3ddd081a9378ec89b888c3bb0fe (diff) | |
APPS: Remove the format argument where it's not used
Also, restore a behaviour change, where load_cert() would look at
stdin when the input file name is NULL, and make sure to call
load_cert_pass() with a corresponding argument where load_cert() was
used in OpenSSL 1.1.1.
Fixes #13235
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13236)
Diffstat (limited to 'apps/s_server.c')
| -rw-r--r-- | apps/s_server.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index dee38584c4..cd76ababe0 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -1744,8 +1744,7 @@ int s_server_main(int argc, char *argv[]) if (s_key == NULL) goto end; - s_cert = load_cert_pass(s_cert_file, s_cert_format, pass, - "server certificate"); + s_cert = load_cert_pass(s_cert_file, 1, pass, "server certificate"); if (s_cert == NULL) goto end; @@ -1761,7 +1760,7 @@ int s_server_main(int argc, char *argv[]) if (s_key2 == NULL) goto end; - s_cert2 = load_cert_pass(s_cert_file2, s_cert_format, pass, + s_cert2 = load_cert_pass(s_cert_file2, 1, pass, "second server certificate"); if (s_cert2 == NULL) @@ -1784,7 +1783,7 @@ int s_server_main(int argc, char *argv[]) if (crl_file != NULL) { X509_CRL *crl; - crl = load_crl(crl_file, crl_format, "CRL"); + crl = load_crl(crl_file, "CRL"); if (crl == NULL) goto end; crls = sk_X509_CRL_new_null(); @@ -1806,8 +1805,8 @@ int s_server_main(int argc, char *argv[]) if (s_dkey == NULL) goto end; - s_dcert = load_cert_pass(s_dcert_file, s_dcert_format, dpass, - "second server certificate"); + s_dcert = load_cert_pass(s_dcert_file, 1, dpass, + "second server certificate"); if (s_dcert == NULL) { ERR_print_errors(bio_err); |