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/smime.c | |
| parent | b6120b5f5442c3ddd081a9378ec89b888c3bb0fe (diff) | |
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/smime.c')
| -rw-r--r-- | apps/smime.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/apps/smime.c b/apps/smime.c index 89dc0eac96..f0ac6ed99c 100644 --- a/apps/smime.c +++ b/apps/smime.c @@ -435,8 +435,7 @@ int smime_main(int argc, char **argv) if (encerts == NULL) goto end; while (*argv != NULL) { - cert = load_cert(*argv, FORMAT_UNDEF, - "recipient certificate file"); + cert = load_cert(*argv, "recipient certificate file"); if (cert == NULL) goto end; sk_X509_push(encerts, cert); @@ -453,7 +452,7 @@ int smime_main(int argc, char **argv) } if (recipfile != NULL && (operation == SMIME_DECRYPT)) { - if ((recip = load_cert(recipfile, FORMAT_UNDEF, + if ((recip = load_cert(recipfile, "recipient certificate file")) == NULL) { ERR_print_errors(bio_err); goto end; @@ -568,8 +567,7 @@ int smime_main(int argc, char **argv) for (i = 0; i < sk_OPENSSL_STRING_num(sksigners); i++) { signerfile = sk_OPENSSL_STRING_value(sksigners, i); keyfile = sk_OPENSSL_STRING_value(skkeys, i); - signer = load_cert(signerfile, FORMAT_UNDEF, - "signer certificate"); + signer = load_cert(signerfile, "signer certificate"); if (signer == NULL) goto end; key = load_key(keyfile, keyform, 0, passin, e, "signing key"); |