From 50eb2a507732b4d32879709dbfa335ccb542f676 Mon Sep 17 00:00:00 2001 From: "Dr. David von Oheimb" Date: Thu, 17 Sep 2020 01:39:00 +0200 Subject: load_key_certs_crls(): Restore output of fatal errors Also improve credentials loading diagnostics for many apps. Fixes #12840 Reviewed-by: Tomas Mraz Reviewed-by: Richard Levitte (Merged from https://github.com/openssl/openssl/pull/12893) --- apps/cms.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'apps/cms.c') diff --git a/apps/cms.c b/apps/cms.c index 178c441f1a..ad8f64fcaa 100644 --- a/apps/cms.c +++ b/apps/cms.c @@ -857,7 +857,7 @@ int cms_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; @@ -1060,7 +1060,7 @@ int cms_main(int argc, char **argv) ret = 2; 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) { ret = 2; goto end; -- cgit v1.2.3