diff options
| author | Rich Salz <rsalz@akamai.com> | 2021-02-08 14:03:35 -0500 |
|---|---|---|
| committer | Pauli <ppzgs1@gmail.com> | 2021-02-12 08:34:17 +1000 |
| commit | d0190e11639956677747f6bc7bb5bcd610fd8600 (patch) | |
| tree | 65b3b8fa880bd32563f4e59bc82624489673da6d /apps/smime.c | |
| parent | 51e5df0ed01efa47335940425cc8744ecff1b6ae (diff) | |
Process digest option after loading providers
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14135)
Diffstat (limited to 'apps/smime.c')
| -rw-r--r-- | apps/smime.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/apps/smime.c b/apps/smime.c index db9cf8f1f1..fd1e2e6810 100644 --- a/apps/smime.c +++ b/apps/smime.c @@ -145,7 +145,8 @@ int smime_main(int argc, char **argv) const char *CAfile = NULL, *CApath = NULL, *CAstore = NULL, *prog = NULL; char *certfile = NULL, *keyfile = NULL, *contfile = NULL; char *infile = NULL, *outfile = NULL, *signerfile = NULL, *recipfile = NULL; - char *passinarg = NULL, *passin = NULL, *to = NULL, *from = NULL, *subject = NULL; + char *passinarg = NULL, *passin = NULL, *to = NULL, *from = NULL; + char *subject = NULL, *digestname = NULL; OPTION_CHOICE o; int noCApath = 0, noCAfile = 0, noCAstore = 0; int flags = PKCS7_DETACHED, operation = 0, ret = 0, indef = 0; @@ -293,8 +294,7 @@ int smime_main(int argc, char **argv) recipfile = opt_arg(); break; case OPT_MD: - if (!opt_md(opt_arg(), &sign_md)) - goto opthelp; + digestname = opt_arg(); break; case OPT_CIPHER: if (!opt_cipher(opt_unknown(), &cipher)) @@ -361,6 +361,10 @@ int smime_main(int argc, char **argv) argv = opt_rest(); app_RAND_load(); + if (digestname != NULL) { + if (!opt_md(digestname, &sign_md)) + goto opthelp; + } if (!(operation & SMIME_SIGNERS) && (skkeys != NULL || sksigners != NULL)) { BIO_puts(bio_err, "Multiple signers or keys not allowed\n"); goto opthelp; |