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/x509.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/x509.c')
| -rw-r--r-- | apps/x509.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/x509.c b/apps/x509.c index 5627bd9dbe..367cbf45f1 100644 --- a/apps/x509.c +++ b/apps/x509.c @@ -522,7 +522,7 @@ int x509_main(int argc, char **argv) goto end; } if (fkeyfile != NULL) { - fkey = load_pubkey(fkeyfile, keyformat, 0, NULL, e, "Forced key"); + fkey = load_pubkey(fkeyfile, keyformat, 0, NULL, e, "forced key"); if (fkey == NULL) goto end; } @@ -629,7 +629,7 @@ int x509_main(int argc, char **argv) if (!X509_set_pubkey(x, fkey != NULL ? fkey : X509_REQ_get0_pubkey(req))) goto end; } else { - x = load_cert_pass(infile, FORMAT_UNDEF, passin, "Certificate"); + x = load_cert_pass(infile, FORMAT_UNDEF, passin, "certificate"); if (x == NULL) goto end; if (fkey != NULL && !X509_set_pubkey(x, fkey)) @@ -639,7 +639,7 @@ int x509_main(int argc, char **argv) } if (CA_flag) { - xca = load_cert_pass(CAfile, CAformat, passin, "CA Certificate"); + xca = load_cert_pass(CAfile, CAformat, passin, "CA certificate"); if (xca == NULL) goto end; } @@ -846,7 +846,7 @@ int x509_main(int argc, char **argv) BIO_printf(bio_err, "Getting Private key\n"); if (Upkey == NULL) { Upkey = load_key(keyfile, keyformat, 0, - passin, e, "Private key"); + passin, e, "private key"); if (Upkey == NULL) goto end; } @@ -858,7 +858,7 @@ int x509_main(int argc, char **argv) BIO_printf(bio_err, "Getting CA Private Key\n"); if (CAkeyfile != NULL) { CApkey = load_key(CAkeyfile, CAkeyformat, - 0, passin, e, "CA Private Key"); + 0, passin, e, "CA private key"); if (CApkey == NULL) goto end; } |