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/crl.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/crl.c')
| -rw-r--r-- | apps/crl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/crl.c b/apps/crl.c index 4cb1bcc2c3..680c0ee128 100644 --- a/apps/crl.c +++ b/apps/crl.c @@ -205,7 +205,7 @@ int crl_main(int argc, char **argv) if (argc != 0) goto opthelp; - x = load_crl(infile, informat, "CRL"); + x = load_crl(infile, "CRL"); if (x == NULL) goto end; @@ -250,7 +250,7 @@ int crl_main(int argc, char **argv) BIO_puts(bio_err, "Missing CRL signing key\n"); goto end; } - newcrl = load_crl(crldiff, informat, "other CRL"); + newcrl = load_crl(crldiff, "other CRL"); if (!newcrl) goto end; pkey = load_key(keyfile, keyformat, 0, NULL, NULL, "CRL signing key"); |