diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-09-17 01:39:00 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-09-24 14:34:56 +0200 |
| commit | 50eb2a507732b4d32879709dbfa335ccb542f676 (patch) | |
| tree | 18bba64cf2babfee3c6ee5f89a7cde5c579d7807 /apps/s_server.c | |
| parent | 254b5dcabd205b2229439020c768a0c9da0d8d7b (diff) | |
load_key_certs_crls(): Restore output of fatal errors
Also improve credentials loading diagnostics for many apps.
Fixes #12840
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12893)
Diffstat (limited to 'apps/s_server.c')
| -rw-r--r-- | apps/s_server.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/s_server.c b/apps/s_server.c index dde0ee60c0..dee38584c4 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -1740,12 +1740,12 @@ int s_server_main(int argc, char *argv[]) if (nocert == 0) { s_key = load_key(s_key_file, s_key_format, 0, pass, engine, - "server certificate private key file"); + "server certificate private key"); if (s_key == NULL) goto end; s_cert = load_cert_pass(s_cert_file, s_cert_format, pass, - "server certificate file"); + "server certificate"); if (s_cert == NULL) goto end; @@ -1757,12 +1757,12 @@ int s_server_main(int argc, char *argv[]) if (tlsextcbp.servername != NULL) { s_key2 = load_key(s_key_file2, s_key_format, 0, pass, engine, - "second server certificate private key file"); + "second server certificate private key"); if (s_key2 == NULL) goto end; s_cert2 = load_cert_pass(s_cert_file2, s_cert_format, pass, - "second server certificate file"); + "second server certificate"); if (s_cert2 == NULL) goto end; @@ -1802,12 +1802,12 @@ int s_server_main(int argc, char *argv[]) s_dkey_file = s_dcert_file; s_dkey = load_key(s_dkey_file, s_dkey_format, - 0, dpass, engine, "second certificate private key file"); + 0, dpass, engine, "second certificate private key"); if (s_dkey == NULL) goto end; s_dcert = load_cert_pass(s_dcert_file, s_dcert_format, dpass, - "second server certificate file"); + "second server certificate"); if (s_dcert == NULL) { ERR_print_errors(bio_err); |