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/ca.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/ca.c')
| -rw-r--r-- | apps/ca.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -1269,7 +1269,8 @@ end_of_options: } else { X509 *revcert; - revcert = load_cert_pass(infile, certformat, passin, infile); + revcert = load_cert_pass(infile, certformat, passin, + "certificate to be revoked"); if (revcert == NULL) goto end; if (dorevoke == 2) @@ -1403,7 +1404,7 @@ static int certify_cert(X509 **xret, const char *infile, int certformat, EVP_PKEY *pktmp = NULL; int ok = -1, i; - if ((req = load_cert_pass(infile, certformat, passin, infile)) == NULL) + if ((req = load_cert_pass(infile, certformat, passin, "template certificate")) == NULL) goto end; if (verbose) X509_print(bio_err, req); |