summaryrefslogtreecommitdiffstats
path: root/apps/smime.c
diff options
context:
space:
mode:
authorDr. David von Oheimb <David.von.Oheimb@siemens.com>2020-09-17 01:39:00 +0200
committerDr. David von Oheimb <David.von.Oheimb@siemens.com>2020-09-24 14:34:56 +0200
commit50eb2a507732b4d32879709dbfa335ccb542f676 (patch)
tree18bba64cf2babfee3c6ee5f89a7cde5c579d7807 /apps/smime.c
parentACVP: add test case for DRBG (diff)
downloadopenssl-50eb2a507732b4d32879709dbfa335ccb542f676.tar.xz
openssl-50eb2a507732b4d32879709dbfa335ccb542f676.zip
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/smime.c')
-rw-r--r--apps/smime.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/smime.c b/apps/smime.c
index 9113038db7..e6d539457e 100644
--- a/apps/smime.c
+++ b/apps/smime.c
@@ -471,7 +471,7 @@ int smime_main(int argc, char **argv)
}
if (keyfile != NULL) {
- key = load_key(keyfile, keyform, 0, passin, e, "signing key file");
+ key = load_key(keyfile, keyform, 0, passin, e, "signing key");
if (key == NULL)
goto end;
@@ -573,7 +573,7 @@ int smime_main(int argc, char **argv)
"signer certificate");
if (signer == NULL)
goto end;
- key = load_key(keyfile, keyform, 0, passin, e, "signing key file");
+ key = load_key(keyfile, keyform, 0, passin, e, "signing key");
if (key == NULL)
goto end;