diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-08-16 15:25:27 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-08-20 14:55:52 +0200 |
| commit | 2a33470b4f23bcf1cd66bbf645c855142efa0ed9 (patch) | |
| tree | 5b739438019058a19ede7530679a1b4fd4e75b3c /apps/x509.c | |
| parent | b3c5aadf4ce3dc2207cc605726bf370a55b531c9 (diff) | |
Make better use of new load_cert_pass() variant of load_cert() in apps/
allows loading password-protected PKCS#12 files in x509, ca, s_client, s_server
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12647)
Diffstat (limited to 'apps/x509.c')
| -rw-r--r-- | apps/x509.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/x509.c b/apps/x509.c index fbe4b8cefe..64a1cadc97 100644 --- a/apps/x509.c +++ b/apps/x509.c @@ -80,7 +80,7 @@ const OPTIONS x509_options[] = { {"inform", OPT_INFORM, 'f', "CSR input format (DER or PEM) - default PEM"}, {"in", OPT_IN, '<', "Input file - default stdin"}, - {"passin", OPT_PASSIN, 's', "Private key password/pass-phrase source"}, + {"passin", OPT_PASSIN, 's', "Private key and cert file pass-phrase source"}, {"outform", OPT_OUTFORM, 'f', "Output format (DER or PEM) - default PEM"}, {"out", OPT_OUT, '>', "Output file - default stdout"}, @@ -633,7 +633,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(infile, FORMAT_UNDEF, "Certificate"); + x = load_cert_pass(infile, FORMAT_UNDEF, passin, "Certificate"); if (x == NULL) goto end; if (fkey != NULL && !X509_set_pubkey(x, fkey)) @@ -643,7 +643,7 @@ int x509_main(int argc, char **argv) } if (CA_flag) { - xca = load_cert(CAfile, CAformat, "CA Certificate"); + xca = load_cert_pass(CAfile, CAformat, passin, "CA Certificate"); if (xca == NULL) goto end; } @@ -963,7 +963,7 @@ int x509_main(int argc, char **argv) sk_ASN1_OBJECT_pop_free(reject, ASN1_OBJECT_free); ASN1_OBJECT_free(objtmp); release_engine(e); - OPENSSL_free(passin); + clear_free(passin); return ret; } |