diff options
| author | Tomas Mraz <tomas@openssl.org> | 2021-08-04 14:55:30 +0200 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-08-05 16:49:58 +0200 |
| commit | 37578dc02df99011c2a4c57ac06c49bd40829dc9 (patch) | |
| tree | c80bdddf9ca09b1931d8df4b73d6319046f276a8 /apps/cms.c | |
| parent | f5c0f696193fa28741dfc08ab6b024cd07e38e5e (diff) | |
cms: Fix handling of -rctform option
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/16216)
Diffstat (limited to 'apps/cms.c')
| -rw-r--r-- | apps/cms.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/apps/cms.c b/apps/cms.c index 714cf3e4ff..c22027e3b1 100644 --- a/apps/cms.c +++ b/apps/cms.c @@ -484,13 +484,9 @@ int cms_main(int argc, char **argv) rr_allorfirst = 1; break; case OPT_RCTFORM: - if (rctformat == FORMAT_ASN1) { - if (!opt_format(opt_arg(), - OPT_FMT_PEMDER | OPT_FMT_SMIME, &rctformat)) - goto opthelp; - } else { - rcms = load_content_info(rctformat, rctin, 0, NULL, "recipient"); - } + if (!opt_format(opt_arg(), + OPT_FMT_PEMDER | OPT_FMT_SMIME, &rctformat)) + goto opthelp; break; case OPT_CERTFILE: certfile = opt_arg(); @@ -956,7 +952,7 @@ int cms_main(int argc, char **argv) goto end; } - rcms = load_content_info(rctformat, rctin, 0, NULL, "recipient"); + rcms = load_content_info(rctformat, rctin, 0, NULL, "receipt"); if (rcms == NULL) goto end; } |