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_client.c | |
| parent | 254b5dcabd205b2229439020c768a0c9da0d8d7b (diff) | |
| download | openssl-new-50eb2a507732b4d32879709dbfa335ccb542f676.tar.gz | |
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_client.c')
| -rw-r--r-- | apps/s_client.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index ca9891aba8..513beeaa9a 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -1728,13 +1728,13 @@ int s_client_main(int argc, char **argv) if (key_file != NULL) { key = load_key(key_file, key_format, 0, pass, e, - "client certificate private key file"); + "client certificate private key"); if (key == NULL) goto end; } if (cert_file != NULL) { - cert = load_cert_pass(cert_file, cert_format, pass, "client certificate file"); + cert = load_cert_pass(cert_file, cert_format, pass, "client certificate"); if (cert == NULL) goto end; } |