From: Tomas Mraz <tomas@openssl.org>
Date: Wed, 4 Aug 2021 12:55:30 +0000 (+0200)
Subject: cms: Fix handling of -rctform option
X-Git-Tag: openssl-3.0.0~140
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=37578dc02df99011c2a4c57ac06c49bd40829dc9;p=thirdparty%2Fopenssl.git

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)
---

diff --git a/apps/cms.c b/apps/cms.c
index 714cf3e4ff5..c22027e3b19 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;
     }