diff options
author | Richard Levitte <levitte@openssl.org> | 2020-10-24 16:31:57 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2020-10-26 09:43:39 +0100 |
commit | 22dddfb925da8775eaf4ee8c377da41e6535afe1 (patch) | |
tree | 86eae67fce686dd241e2540b7b03b42b247f7918 /apps/ca.c | |
parent | b6120b5f5442c3ddd081a9378ec89b888c3bb0fe (diff) | |
download | openssl-22dddfb925da8775eaf4ee8c377da41e6535afe1.tar.gz |
APPS: Remove the format argument where it's not used
Also, restore a behaviour change, where load_cert() would look at
stdin when the input file name is NULL, and make sure to call
load_cert_pass() with a corresponding argument where load_cert() was
used in OpenSSL 1.1.1.
Fixes #13235
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13236)
Diffstat (limited to 'apps/ca.c')
-rwxr-xr-x | apps/ca.c | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -591,7 +591,7 @@ end_of_options: && (certfile = lookup_conf(conf, section, ENV_CERTIFICATE)) == NULL) goto end; - x509 = load_cert_pass(certfile, certformat, passin, "CA certificate"); + x509 = load_cert_pass(certfile, 1, passin, "CA certificate"); if (x509 == NULL) goto end; @@ -1269,7 +1269,7 @@ end_of_options: } else { X509 *revcert; - revcert = load_cert_pass(infile, certformat, passin, + revcert = load_cert_pass(infile, 1, passin, "certificate to be revoked"); if (revcert == NULL) goto end; @@ -1404,7 +1404,8 @@ static int certify_cert(X509 **xret, const char *infile, int certformat, EVP_PKEY *pktmp = NULL; int ok = -1, i; - if ((template_cert = load_cert_pass(infile, certformat, passin, "template certificate")) == NULL) + if ((template_cert = load_cert_pass(infile, 1, passin, + "template certificate")) == NULL) goto end; if (verbose) X509_print(bio_err, template_cert); |