Update copyright year
[openssl.git] / test / recipes / 80-test_cms.t
index 1775ac406766c657f4c100f2714137157c934171..8e1478c3869212c9ea14efb8efab396b4eddf31c 100644 (file)
@@ -1,4 +1,11 @@
-#! /usr/bin/perl
+#! /usr/bin/env perl
+# Copyright 2015-2021 The OpenSSL Project Authors. All Rights Reserved.
+#
+# Licensed under the Apache License 2.0 (the "License").  You may not use
+# this file except in compliance with the License.  You can obtain a copy
+# in the file LICENSE in the source distribution or at
+# https://www.openssl.org/source/license.html
+
 
 use strict;
 use warnings;
@@ -6,158 +13,240 @@ use warnings;
 use POSIX;
 use File::Spec::Functions qw/catfile/;
 use File::Compare qw/compare_text/;
-use Test::More;
-use OpenSSL::Test qw/:DEFAULT top_dir top_file/;
+use OpenSSL::Test qw/:DEFAULT srctop_dir srctop_file bldtop_dir bldtop_file/;
+
+use OpenSSL::Test::Utils;
+
+BEGIN {
+    setup("test_cms");
+}
+
+use lib srctop_dir('Configurations');
+use lib bldtop_dir('.');
+use platform;
+
+my $no_fips = disabled('fips') || ($ENV{NO_FIPS} // 0);
+
+plan skip_all => "CMS is not supported by this OpenSSL build"
+    if disabled("cms");
+
+my $provpath = bldtop_dir("providers");
+
+# Some tests require legacy algorithms to be included.
+my @legacyprov = ("-provider-path", $provpath,
+                  "-provider", "default",
+                  "-provider", "legacy" );
+my @defaultprov = ("-provider-path", $provpath,
+                   "-provider", "default");
+
+my @config = ( );
+my $provname = 'default';
+
+my $datadir = srctop_dir("test", "recipes", "80-test_cms_data");
+my $smdir    = srctop_dir("test", "smime-certs");
+my $smcont   = srctop_file("test", "smcont.txt");
+my $smcont_zero = srctop_file("test", "smcont_zero.txt");
+my ($no_des, $no_dh, $no_dsa, $no_ec, $no_ec2m, $no_rc2, $no_zlib)
+    = disabled qw/des dh dsa ec ec2m rc2 zlib/;
+
+$no_rc2 = 1 if disabled("legacy");
 
-setup("test_cms");
+plan tests =>
+    ($no_fips ? 0 : 1)          # FIPS install test
+    + 10;
 
-my $smdir    = top_dir("test", "smime-certs");
-my $smcont   = top_file("test", "smcont.txt");
-my $no_ec    = run(app(["openssl", "no-ec"], stdout => undef));
-my $no_ec2m  = run(app(["openssl", "no-ec2m"], stdout => undef));
-my $no_ecdh  = run(app(["openssl", "no-ecdh"], stdout => undef));
+unless ($no_fips) {
+    my $infile = bldtop_file('providers', platform->dso('fips'));
 
-plan tests => 4;
+    ok(run(app(['openssl', 'fipsinstall',
+                '-out', bldtop_file('providers', 'fipsmodule.cnf'),
+                '-module', $infile])),
+       "fipsinstall");
+    @config = ( "-config", srctop_file("test", "fips-and-base.cnf") );
+    $provname = 'fips';
+}
+
+$ENV{OPENSSL_TEST_LIBCTX} = "1";
+my @prov = ("-provider-path", $provpath,
+            @config,
+            "-provider", $provname);
 
 my @smime_pkcs7_tests = (
 
     [ "signed content DER format, RSA key",
-      [ "-sign", "-in", $smcont, "-outform", "DER", "-nodetach",
-       "-certfile", catfile($smdir, "smroot.pem"),
-       "-signer", catfile($smdir, "smrsa1.pem"), "-out", "test.cms" ],
-      [ "-verify", "-in", "test.cms", "-inform", "DER",
-       "-CAfile", catfile($smdir, "smroot.pem"), "-out", "smtst.txt" ]
+      [ "{cmd1}", @prov, "-sign", "-in", $smcont, "-outform", "DER", "-nodetach",
+        "-certfile", catfile($smdir, "smroot.pem"),
+        "-signer", catfile($smdir, "smrsa1.pem"), "-out", "{output}.cms" ],
+      [ "{cmd2}",  @prov, "-verify", "-in", "{output}.cms", "-inform", "DER",
+        "-CAfile", catfile($smdir, "smroot.pem"), "-out", "{output}.txt" ],
+      \&final_compare
     ],
 
     [ "signed detached content DER format, RSA key",
-      [ "-sign", "-in", $smcont, "-outform", "DER",
-       "-signer", catfile($smdir, "smrsa1.pem"), "-out", "test.cms" ],
-      [ "-verify", "-in", "test.cms", "-inform", "DER",
-       "-CAfile", catfile($smdir, "smroot.pem"), "-out", "smtst.txt",
-       "-content", $smcont ]
+      [ "{cmd1}", @prov, "-sign", "-in", $smcont, "-outform", "DER",
+        "-signer", catfile($smdir, "smrsa1.pem"), "-out", "{output}.cms" ],
+      [ "{cmd2}", @prov, "-verify", "-in", "{output}.cms", "-inform", "DER",
+        "-CAfile", catfile($smdir, "smroot.pem"), "-out", "{output}.txt",
+        "-content", $smcont ],
+      \&final_compare
     ],
 
     [ "signed content test streaming BER format, RSA",
-      [ "-sign", "-in", $smcont, "-outform", "DER", "-nodetach",
-       "-stream",
-       "-signer", catfile($smdir, "smrsa1.pem"), "-out", "test.cms" ],
-      [ "-verify", "-in", "test.cms", "-inform", "DER",
-       "-CAfile", catfile($smdir, "smroot.pem"), "-out", "smtst.txt" ]
+      [ "{cmd1}", @prov, "-sign", "-in", $smcont, "-outform", "DER", "-nodetach",
+        "-stream",
+        "-signer", catfile($smdir, "smrsa1.pem"), "-out", "{output}.cms" ],
+      [ "{cmd2}", @prov, "-verify", "-in", "{output}.cms", "-inform", "DER",
+        "-CAfile", catfile($smdir, "smroot.pem"), "-out", "{output}.txt" ],
+      \&final_compare
     ],
 
     [ "signed content DER format, DSA key",
-      [ "-sign", "-in", $smcont, "-outform", "DER", "-nodetach",
-       "-signer", catfile($smdir, "smdsa1.pem"), "-out", "test.cms" ],
-      [ "-verify", "-in", "test.cms", "-inform", "DER",
-       "-CAfile", catfile($smdir, "smroot.pem"), "-out", "smtst.txt" ]
+      [ "{cmd1}", @prov, "-sign", "-in", $smcont, "-outform", "DER", "-nodetach",
+        "-signer", catfile($smdir, "smdsa1.pem"), "-out", "{output}.cms" ],
+      [ "{cmd2}", @prov, "-verify", "-in", "{output}.cms", "-inform", "DER",
+        "-CAfile", catfile($smdir, "smroot.pem"), "-out", "{output}.txt" ],
+      \&final_compare
     ],
 
     [ "signed detached content DER format, DSA key",
-      [ "-sign", "-in", $smcont, "-outform", "DER",
-       "-signer", catfile($smdir, "smdsa1.pem"), "-out", "test.cms" ],
-      [ "-verify", "-in", "test.cms", "-inform", "DER",
-       "-CAfile", catfile($smdir, "smroot.pem"), "-out", "smtst.txt",
-       "-content", $smcont ]
+      [ "{cmd1}", @prov, "-sign", "-in", $smcont, "-outform", "DER",
+        "-signer", catfile($smdir, "smdsa1.pem"), "-out", "{output}.cms" ],
+      [ "{cmd2}", @prov, "-verify", "-in", "{output}.cms", "-inform", "DER",
+        "-CAfile", catfile($smdir, "smroot.pem"), "-out", "{output}.txt",
+        "-content", $smcont ],
+      \&final_compare
     ],
 
-    [ "signed detached content DER format, add RSA signer",
-      [ "-resign", "-inform", "DER", "-in", "test.cms", "-outform", "DER",
-       "-signer", catfile($smdir, "smrsa1.pem"), "-out", "test2.cms" ],
-      [ "-verify", "-in", "test2.cms", "-inform", "DER",
-       "-CAfile", catfile($smdir, "smroot.pem"), "-out", "smtst.txt",
-       "-content", $smcont ]
+    [ "signed detached content DER format, add RSA signer (with DSA existing)",
+      [ "{cmd1}", @prov, "-sign", "-in", $smcont, "-outform", "DER",
+        "-signer", catfile($smdir, "smdsa1.pem"), "-out", "{output}.cms" ],
+      [ "{cmd1}", @prov, "-resign", "-in", "{output}.cms", "-inform", "DER", "-outform", "DER",
+        "-signer", catfile($smdir, "smrsa1.pem"), "-out", "{output}2.cms" ],
+      [ "{cmd2}", @prov, "-verify", "-in", "{output}2.cms", "-inform", "DER",
+        "-CAfile", catfile($smdir, "smroot.pem"), "-out", "{output}.txt",
+        "-content", $smcont ],
+      \&final_compare
     ],
 
     [ "signed content test streaming BER format, DSA key",
-      [ "-sign", "-in", $smcont, "-outform", "DER", "-nodetach",
-       "-stream",
-       "-signer", catfile($smdir, "smdsa1.pem"), "-out", "test.cms" ],
-      [ "-verify", "-in", "test.cms", "-inform", "DER",
-       "-CAfile", catfile($smdir, "smroot.pem"), "-out", "smtst.txt" ]
+      [ "{cmd1}", @prov, "-sign", "-in", $smcont, "-outform", "DER",
+        "-nodetach", "-stream",
+        "-signer", catfile($smdir, "smdsa1.pem"), "-out", "{output}.cms" ],
+      [ "{cmd2}", @prov, "-verify", "-in", "{output}.cms", "-inform", "DER",
+        "-CAfile", catfile($smdir, "smroot.pem"), "-out", "{output}.txt" ],
+      \&final_compare
     ],
 
     [ "signed content test streaming BER format, 2 DSA and 2 RSA keys",
-      [ "-sign", "-in", $smcont, "-outform", "DER", "-nodetach",
-       "-signer", catfile($smdir, "smrsa1.pem"),
-       "-signer", catfile($smdir, "smrsa2.pem"),
-       "-signer", catfile($smdir, "smdsa1.pem"),
-       "-signer", catfile($smdir, "smdsa2.pem"),
-       "-stream", "-out", "test.cms" ],
-      [ "-verify", "-in", "test.cms", "-inform", "DER",
-       "-CAfile", catfile($smdir, "smroot.pem"), "-out", "smtst.txt" ]
+      [ "{cmd1}", @prov, "-sign", "-in", $smcont, "-outform", "DER",
+        "-nodetach", "-stream",
+        "-signer", catfile($smdir, "smrsa1.pem"),
+        "-signer", catfile($smdir, "smrsa2.pem"),
+        "-signer", catfile($smdir, "smdsa1.pem"),
+        "-signer", catfile($smdir, "smdsa2.pem"),
+        "-out", "{output}.cms" ],
+      [ "{cmd2}", @prov, "-verify", "-in", "{output}.cms", "-inform", "DER",
+        "-CAfile", catfile($smdir, "smroot.pem"), "-out", "{output}.txt" ],
+      \&final_compare
     ],
 
     [ "signed content test streaming BER format, 2 DSA and 2 RSA keys, no attributes",
-      [ "-sign", "-in", $smcont, "-outform", "DER", "-noattr", "-nodetach",
-       "-signer", catfile($smdir, "smrsa1.pem"),
-       "-signer", catfile($smdir, "smrsa2.pem"),
-       "-signer", catfile($smdir, "smdsa1.pem"),
-       "-signer", catfile($smdir, "smdsa2.pem"),
-       "-stream", "-out", "test.cms" ],
-      [ "-verify", "-in", "test.cms", "-inform", "DER",
-       "-CAfile", catfile($smdir, "smroot.pem"), "-out", "smtst.txt" ]
+      [ "{cmd1}", @prov, "-sign", "-in", $smcont, "-outform", "DER",
+        "-noattr", "-nodetach", "-stream",
+        "-signer", catfile($smdir, "smrsa1.pem"),
+        "-signer", catfile($smdir, "smrsa2.pem"),
+        "-signer", catfile($smdir, "smdsa1.pem"),
+        "-signer", catfile($smdir, "smdsa2.pem"),
+        "-out", "{output}.cms" ],
+      [ "{cmd2}", @prov, "-verify", "-in", "{output}.cms", "-inform", "DER",
+        "-CAfile", catfile($smdir, "smroot.pem"), "-out", "{output}.txt" ],
+      \&final_compare
+    ],
+
+    [ "signed content S/MIME format, RSA key SHA1",
+      [ "{cmd1}", @defaultprov, "-sign", "-in", $smcont, "-md", "sha1",
+        "-certfile", catfile($smdir, "smroot.pem"),
+        "-signer", catfile($smdir, "smrsa1.pem"), "-out", "{output}.cms" ],
+      [ "{cmd2}", @prov, "-verify", "-in", "{output}.cms",
+        "-CAfile", catfile($smdir, "smroot.pem"), "-out", "{output}.txt" ],
+      \&final_compare
+    ],
+
+    [ "signed zero-length content S/MIME format, RSA key SHA1",
+      [ "{cmd1}", @defaultprov, "-sign", "-in", $smcont_zero, "-md", "sha1",
+        "-certfile", catfile($smdir, "smroot.pem"),
+        "-signer", catfile($smdir, "smrsa1.pem"), "-out", "{output}.cms" ],
+      [ "{cmd2}", @prov, "-verify", "-in", "{output}.cms",
+        "-CAfile", catfile($smdir, "smroot.pem"), "-out", "{output}.txt" ],
+      \&zero_compare
     ],
 
     [ "signed content test streaming S/MIME format, 2 DSA and 2 RSA keys",
-      [ "-sign", "-in", $smcont, "-nodetach",
-       "-signer", catfile($smdir, "smrsa1.pem"),
-       "-signer", catfile($smdir, "smrsa2.pem"),
-       "-signer", catfile($smdir, "smdsa1.pem"),
-       "-signer", catfile($smdir, "smdsa2.pem"),
-       "-stream", "-out", "test.cms" ],
-      [ "-verify", "-in", "test.cms",
-       "-CAfile", catfile($smdir, "smroot.pem"), "-out", "smtst.txt" ]
+      [ "{cmd1}", @prov, "-sign", "-in", $smcont, "-nodetach",
+        "-signer", catfile($smdir, "smrsa1.pem"),
+        "-signer", catfile($smdir, "smrsa2.pem"),
+        "-signer", catfile($smdir, "smdsa1.pem"),
+        "-signer", catfile($smdir, "smdsa2.pem"),
+        "-stream", "-out", "{output}.cms" ],
+      [ "{cmd2}", @prov, "-verify", "-in", "{output}.cms",
+        "-CAfile", catfile($smdir, "smroot.pem"), "-out", "{output}.txt" ],
+      \&final_compare
     ],
 
     [ "signed content test streaming multipart S/MIME format, 2 DSA and 2 RSA keys",
-      [ "-sign", "-in", $smcont,
-       "-signer", catfile($smdir, "smrsa1.pem"),
-       "-signer", catfile($smdir, "smrsa2.pem"),
-       "-signer", catfile($smdir, "smdsa1.pem"),
-       "-signer", catfile($smdir, "smdsa2.pem"),
-       "-stream", "-out", "test.cms" ],
-      [ "-verify", "-in", "test.cms",
-       "-CAfile", catfile($smdir, "smroot.pem"), "-out", "smtst.txt" ]
-    ],
-
-    [ "enveloped content test streaming S/MIME format, 3 recipients",
-      [ "-encrypt", "-in", $smcont,
-       "-stream", "-out", "test.cms",
-       catfile($smdir, "smrsa1.pem"),
-       catfile($smdir, "smrsa2.pem"),
-       catfile($smdir, "smrsa3.pem") ],
-      [ "-decrypt", "-recip", catfile($smdir, "smrsa1.pem"),
-       "-in", "test.cms", "-out", "smtst.txt" ]
-    ],
-
-    [ "enveloped content test streaming S/MIME format, 3 recipients, 3rd used",
-      [ "-encrypt", "-in", $smcont,
-       "-stream", "-out", "test.cms",
-       catfile($smdir, "smrsa1.pem"),
-       catfile($smdir, "smrsa2.pem"),
-       catfile($smdir, "smrsa3.pem") ],
-      [ "-decrypt", "-recip", catfile($smdir, "smrsa3.pem"),
-       "-in", "test.cms", "-out", "smtst.txt" ]
-    ],
-
-    [ "enveloped content test streaming S/MIME format, 3 recipients, key only used",
-      [ "-encrypt", "-in", $smcont,
-       "-stream", "-out", "test.cms",
-       catfile($smdir, "smrsa1.pem"),
-       catfile($smdir, "smrsa2.pem"),
-       catfile($smdir, "smrsa3.pem") ],
-      [ "-decrypt", "-inkey", catfile($smdir, "smrsa3.pem"),
-       "-in", "test.cms", "-out", "smtst.txt" ]
+      [ "{cmd1}", @prov, "-sign", "-in", $smcont,
+        "-signer", catfile($smdir, "smrsa1.pem"),
+        "-signer", catfile($smdir, "smrsa2.pem"),
+        "-signer", catfile($smdir, "smdsa1.pem"),
+        "-signer", catfile($smdir, "smdsa2.pem"),
+        "-stream", "-out", "{output}.cms" ],
+      [ "{cmd2}", @prov, "-verify", "-in", "{output}.cms",
+        "-CAfile", catfile($smdir, "smroot.pem"), "-out", "{output}.txt" ],
+      \&final_compare
+    ],
+
+    [ "enveloped content test streaming S/MIME format, DES, 3 recipients",
+      [ "{cmd1}", @defaultprov, "-encrypt", "-in", $smcont,
+        "-stream", "-out", "{output}.cms",
+        catfile($smdir, "smrsa1.pem"),
+        catfile($smdir, "smrsa2.pem"),
+        catfile($smdir, "smrsa3.pem") ],
+      [ "{cmd2}", @defaultprov, "-decrypt", "-recip", catfile($smdir, "smrsa1.pem"),
+        "-in", "{output}.cms", "-out", "{output}.txt" ],
+      \&final_compare
+    ],
+
+    [ "enveloped content test streaming S/MIME format, DES, 3 recipients, 3rd used",
+      [ "{cmd1}", @defaultprov, "-encrypt", "-in", $smcont,
+        "-stream", "-out", "{output}.cms",
+        catfile($smdir, "smrsa1.pem"),
+        catfile($smdir, "smrsa2.pem"),
+        catfile($smdir, "smrsa3.pem") ],
+      [ "{cmd2}", @defaultprov, "-decrypt", "-recip", catfile($smdir, "smrsa3.pem"),
+        "-in", "{output}.cms", "-out", "{output}.txt" ],
+      \&final_compare
+    ],
+
+    [ "enveloped content test streaming S/MIME format, DES, 3 recipients, key only used",
+      [ "{cmd1}", @defaultprov, "-encrypt", "-in", $smcont,
+        "-stream", "-out", "{output}.cms",
+        catfile($smdir, "smrsa1.pem"),
+        catfile($smdir, "smrsa2.pem"),
+        catfile($smdir, "smrsa3.pem") ],
+      [ "{cmd2}", @defaultprov, "-decrypt", "-inkey", catfile($smdir, "smrsa3.pem"),
+        "-in", "{output}.cms", "-out", "{output}.txt" ],
+      \&final_compare
     ],
 
     [ "enveloped content test streaming S/MIME format, AES-256 cipher, 3 recipients",
-      [ "-encrypt", "-in", $smcont,
-       "-aes256", "-stream", "-out", "test.cms",
-       catfile($smdir, "smrsa1.pem"),
-       catfile($smdir, "smrsa2.pem"),
-       catfile($smdir, "smrsa3.pem") ],
-      [ "-decrypt", "-recip", catfile($smdir, "smrsa1.pem"),
-       "-in", "test.cms", "-out", "smtst.txt" ]
+      [ "{cmd1}", @prov, "-encrypt", "-in", $smcont,
+        "-aes256", "-stream", "-out", "{output}.cms",
+        catfile($smdir, "smrsa1.pem"),
+        catfile($smdir, "smrsa2.pem"),
+        catfile($smdir, "smrsa3.pem") ],
+      [ "{cmd2}", @prov, "-decrypt", "-recip", catfile($smdir, "smrsa1.pem"),
+        "-in", "{output}.cms", "-out", "{output}.txt" ],
+      \&final_compare
     ],
 
 );
@@ -165,313 +254,589 @@ my @smime_pkcs7_tests = (
 my @smime_cms_tests = (
 
     [ "signed content test streaming BER format, 2 DSA and 2 RSA keys, keyid",
-      [ "-sign", "-in", $smcont, "-outform", "DER", "-nodetach", "-keyid",
-       "-signer", catfile($smdir, "smrsa1.pem"),
-       "-signer", catfile($smdir, "smrsa2.pem"),
-       "-signer", catfile($smdir, "smdsa1.pem"),
-       "-signer", catfile($smdir, "smdsa2.pem"),
-       "-stream", "-out", "test.cms" ],
-      [ "-verify", "-in", "test.cms", "-inform", "DER",
-       "-CAfile", catfile($smdir, "smroot.pem"), "-out", "smtst.txt" ]
+      [ "{cmd1}", @prov, "-sign", "-in", $smcont, "-outform", "DER",
+        "-nodetach", "-keyid",
+        "-signer", catfile($smdir, "smrsa1.pem"),
+        "-signer", catfile($smdir, "smrsa2.pem"),
+        "-signer", catfile($smdir, "smdsa1.pem"),
+        "-signer", catfile($smdir, "smdsa2.pem"),
+        "-stream", "-out", "{output}.cms" ],
+      [ "{cmd2}", @prov, "-verify", "-in", "{output}.cms", "-inform", "DER",
+        "-CAfile", catfile($smdir, "smroot.pem"), "-out", "{output}.txt" ],
+      \&final_compare
     ],
 
     [ "signed content test streaming PEM format, 2 DSA and 2 RSA keys",
-      [ "-sign", "-in", $smcont, "-outform", "PEM", "-nodetach",
-       "-signer", catfile($smdir, "smrsa1.pem"),
-       "-signer", catfile($smdir, "smrsa2.pem"),
-       "-signer", catfile($smdir, "smdsa1.pem"),
-       "-signer", catfile($smdir, "smdsa2.pem"),
-       "-stream", "-out", "test.cms" ],
-      [ "-verify", "-in", "test.cms", "-inform", "PEM",
-       "-CAfile", catfile($smdir, "smroot.pem"), "-out", "smtst.txt" ]
+      [ "{cmd1}", @prov, "-sign", "-in", $smcont, "-outform", "PEM", "-nodetach",
+        "-signer", catfile($smdir, "smrsa1.pem"),
+        "-signer", catfile($smdir, "smrsa2.pem"),
+        "-signer", catfile($smdir, "smdsa1.pem"),
+        "-signer", catfile($smdir, "smdsa2.pem"),
+        "-stream", "-out", "{output}.cms" ],
+      [ "{cmd2}", @prov, "-verify", "-in", "{output}.cms", "-inform", "PEM",
+        "-CAfile", catfile($smdir, "smroot.pem"), "-out", "{output}.txt" ],
+      \&final_compare
     ],
 
     [ "signed content MIME format, RSA key, signed receipt request",
-      [ "-sign", "-in", $smcont, "-signer", catfile($smdir, "smrsa1.pem"), "-nodetach",
-       "-receipt_request_to", "test\@openssl.org", "-receipt_request_all",
-       "-out", "test.cms" ],
-      [ "-verify", "-in", "test.cms",
-       "-CAfile", catfile($smdir, "smroot.pem"), "-out", "smtst.txt" ]
+      [ "{cmd1}", @prov, "-sign", "-in", $smcont, "-nodetach",
+        "-signer", catfile($smdir, "smrsa1.pem"),
+        "-receipt_request_to", "test\@openssl.org", "-receipt_request_all",
+        "-out", "{output}.cms" ],
+      [ "{cmd2}", @prov, "-verify", "-in", "{output}.cms",
+        "-CAfile", catfile($smdir, "smroot.pem"), "-out", "{output}.txt" ],
+      \&final_compare
     ],
 
     [ "signed receipt MIME format, RSA key",
-      [ "-sign_receipt", "-in", "test.cms",
-       "-signer", catfile($smdir, "smrsa2.pem"),
-       "-out", "test2.cms" ],
-      [ "-verify_receipt", "test2.cms", "-in", "test.cms",
-       "-CAfile", catfile($smdir, "smroot.pem") ]
-    ],
-
-    [ "enveloped content test streaming S/MIME format, 3 recipients, keyid",
-      [ "-encrypt", "-in", $smcont,
-       "-stream", "-out", "test.cms", "-keyid",
-       catfile($smdir, "smrsa1.pem"),
-       catfile($smdir, "smrsa2.pem"),
-       catfile($smdir, "smrsa3.pem") ],
-      [ "-decrypt", "-recip", catfile($smdir, "smrsa1.pem"),
-       "-in", "test.cms", "-out", "smtst.txt" ]
-    ],
-
-    [ "enveloped content test streaming PEM format, KEK",
-      [ "-encrypt", "-in", $smcont, "-outform", "PEM", "-aes128",
-       "-stream", "-out", "test.cms",
-       "-secretkey", "000102030405060708090A0B0C0D0E0F",
-       "-secretkeyid", "C0FEE0" ],
-      [ "-decrypt", "-in", "test.cms", "-out", "smtst.txt", "-inform", "PEM",
-       "-secretkey", "000102030405060708090A0B0C0D0E0F",
-       "-secretkeyid", "C0FEE0" ]
+      [ "{cmd1}", @prov, "-sign", "-in", $smcont, "-nodetach",
+        "-signer", catfile($smdir, "smrsa1.pem"),
+        "-receipt_request_to", "test\@openssl.org", "-receipt_request_all",
+        "-out", "{output}.cms" ],
+      [ "{cmd1}", @prov, "-sign_receipt", "-in", "{output}.cms",
+        "-signer", catfile($smdir, "smrsa2.pem"), "-out", "{output}2.cms" ],
+      [ "{cmd2}", @prov, "-verify_receipt", "{output}2.cms", "-in", "{output}.cms",
+        "-CAfile", catfile($smdir, "smroot.pem") ]
+    ],
+
+    [ "enveloped content test streaming S/MIME format, DES, 3 recipients, keyid",
+      [ "{cmd1}", @defaultprov, "-encrypt", "-in", $smcont,
+        "-stream", "-out", "{output}.cms", "-keyid",
+        catfile($smdir, "smrsa1.pem"),
+        catfile($smdir, "smrsa2.pem"),
+        catfile($smdir, "smrsa3.pem") ],
+      [ "{cmd2}", @defaultprov, "-decrypt", "-recip", catfile($smdir, "smrsa1.pem"),
+        "-in", "{output}.cms", "-out", "{output}.txt" ],
+      \&final_compare
+    ],
+
+    [ "enveloped content test streaming PEM format, AES-256-CBC cipher, KEK",
+      [ "{cmd1}", @prov, "-encrypt", "-in", $smcont, "-outform", "PEM", "-aes128",
+        "-stream", "-out", "{output}.cms",
+        "-secretkey", "000102030405060708090A0B0C0D0E0F",
+        "-secretkeyid", "C0FEE0" ],
+      [ "{cmd2}", @prov, "-decrypt", "-in", "{output}.cms", "-out", "{output}.txt",
+        "-inform", "PEM",
+        "-secretkey", "000102030405060708090A0B0C0D0E0F",
+        "-secretkeyid", "C0FEE0" ],
+      \&final_compare
+    ],
+
+    [ "enveloped content test streaming PEM format, AES-256-GCM cipher, KEK",
+      [ "{cmd1}", @prov, "-encrypt", "-in", $smcont, "-outform", "PEM", "-aes-128-gcm",
+        "-stream", "-out", "{output}.cms",
+        "-secretkey", "000102030405060708090A0B0C0D0E0F",
+        "-secretkeyid", "C0FEE0" ],
+      [ "{cmd2}", "-decrypt", "-in", "{output}.cms", "-out", "{output}.txt",
+        "-inform", "PEM",
+        "-secretkey", "000102030405060708090A0B0C0D0E0F",
+        "-secretkeyid", "C0FEE0" ],
+      \&final_compare
     ],
 
     [ "enveloped content test streaming PEM format, KEK, key only",
-      [ "-encrypt", "-in", $smcont, "-outform", "PEM", "-aes128",
-       "-stream", "-out", "test.cms",
-       "-secretkey", "000102030405060708090A0B0C0D0E0F",
-       "-secretkeyid", "C0FEE0" ],
-      [ "-decrypt", "-in", "test.cms", "-out", "smtst.txt", "-inform", "PEM",
-       "-secretkey", "000102030405060708090A0B0C0D0E0F" ]
+      [ "{cmd1}", @prov, "-encrypt", "-in", $smcont, "-outform", "PEM", "-aes128",
+        "-stream", "-out", "{output}.cms",
+        "-secretkey", "000102030405060708090A0B0C0D0E0F",
+        "-secretkeyid", "C0FEE0" ],
+      [ "{cmd2}", @prov, "-decrypt", "-in", "{output}.cms", "-out", "{output}.txt",
+        "-inform", "PEM",
+        "-secretkey", "000102030405060708090A0B0C0D0E0F" ],
+      \&final_compare
     ],
 
     [ "data content test streaming PEM format",
-      [ "-data_create", "-in", $smcont, "-outform", "PEM", "-nodetach",
-       "-stream", "-out", "test.cms" ],
-      [ "-data_out", "-in", "test.cms", "-inform", "PEM", "-out", "smtst.txt" ]
+      [ "{cmd1}", @prov, "-data_create", "-in", $smcont, "-outform", "PEM",
+        "-nodetach", "-stream", "-out", "{output}.cms" ],
+      [ "{cmd2}", @prov, "-data_out", "-in", "{output}.cms", "-inform", "PEM",
+        "-out", "{output}.txt" ],
+      \&final_compare
     ],
 
     [ "encrypted content test streaming PEM format, 128 bit RC2 key",
-      [ "-EncryptedData_encrypt", "-in", $smcont, "-outform", "PEM",
-       "-rc2", "-secretkey", "000102030405060708090A0B0C0D0E0F",
-       "-stream", "-out", "test.cms" ],
-      [ "-EncryptedData_decrypt", "-in", "test.cms", "-inform", "PEM",
-       "-secretkey", "000102030405060708090A0B0C0D0E0F", "-out", "smtst.txt" ]
+      [ "{cmd1}", @legacyprov, "-EncryptedData_encrypt",
+        "-in", $smcont, "-outform", "PEM",
+        "-rc2", "-secretkey", "000102030405060708090A0B0C0D0E0F",
+        "-stream", "-out", "{output}.cms" ],
+      [ "{cmd2}", @legacyprov, "-EncryptedData_decrypt", "-in", "{output}.cms",
+        "-inform", "PEM",
+        "-secretkey", "000102030405060708090A0B0C0D0E0F",
+        "-out", "{output}.txt" ],
+      \&final_compare
     ],
 
     [ "encrypted content test streaming PEM format, 40 bit RC2 key",
-      [ "-EncryptedData_encrypt", "-in", $smcont, "-outform", "PEM",
-       "-rc2", "-secretkey", "0001020304",
-       "-stream", "-out", "test.cms" ],
-      [ "-EncryptedData_decrypt", "-in", "test.cms", "-inform", "PEM",
-       "-secretkey", "0001020304", "-out", "smtst.txt" ]
+      [ "{cmd1}", @legacyprov, "-EncryptedData_encrypt",
+        "-in", $smcont, "-outform", "PEM",
+        "-rc2", "-secretkey", "0001020304",
+        "-stream", "-out", "{output}.cms" ],
+      [ "{cmd2}", @legacyprov, "-EncryptedData_decrypt", "-in", "{output}.cms",
+        "-inform", "PEM",
+        "-secretkey", "0001020304", "-out", "{output}.txt" ],
+      \&final_compare
     ],
 
     [ "encrypted content test streaming PEM format, triple DES key",
-      [ "-EncryptedData_encrypt", "-in", $smcont, "-outform", "PEM",
-       "-des3", "-secretkey", "000102030405060708090A0B0C0D0E0F1011121314151617",
-       "-stream", "-out", "test.cms" ],
-      [ "-EncryptedData_decrypt", "-in", "test.cms", "-inform", "PEM",
-       "-secretkey", "000102030405060708090A0B0C0D0E0F1011121314151617",
-       "-out", "smtst.txt" ]
+      [ "{cmd1}", @prov, "-EncryptedData_encrypt", "-in", $smcont, "-outform", "PEM",
+        "-des3", "-secretkey", "000102030405060708090A0B0C0D0E0F1011121314151617",
+        "-stream", "-out", "{output}.cms" ],
+      [ "{cmd2}", @prov, "-EncryptedData_decrypt", "-in", "{output}.cms",
+        "-inform", "PEM",
+        "-secretkey", "000102030405060708090A0B0C0D0E0F1011121314151617",
+        "-out", "{output}.txt" ],
+      \&final_compare
     ],
 
     [ "encrypted content test streaming PEM format, 128 bit AES key",
-      [ "-EncryptedData_encrypt", "-in", $smcont, "-outform", "PEM",
-       "-aes128", "-secretkey", "000102030405060708090A0B0C0D0E0F",
-       "-stream", "-out", "test.cms" ],
-      [ "-EncryptedData_decrypt", "-in", "test.cms", "-inform", "PEM",
-       "-secretkey", "000102030405060708090A0B0C0D0E0F", "-out", "smtst.txt" ]
+      [ "{cmd1}", @prov, "-EncryptedData_encrypt", "-in", $smcont, "-outform", "PEM",
+        "-aes128", "-secretkey", "000102030405060708090A0B0C0D0E0F",
+        "-stream", "-out", "{output}.cms" ],
+      [ "{cmd2}", @prov, "-EncryptedData_decrypt", "-in", "{output}.cms",
+        "-inform", "PEM",
+        "-secretkey", "000102030405060708090A0B0C0D0E0F",
+        "-out", "{output}.txt" ],
+      \&final_compare
     ],
+);
+
+my @smime_cms_cades_tests = (
+
+    [ "signed content DER format, RSA key, CAdES-BES compatible",
+      [ "{cmd1}", @prov, "-sign", "-cades", "-in", $smcont, "-outform", "DER",
+         "-nodetach",
+        "-certfile", catfile($smdir, "smroot.pem"),
+        "-signer", catfile($smdir, "smrsa1.pem"), "-out", "{output}.cms" ],
+      [ "{cmd2}", @prov, "-verify", "-cades", "-in", "{output}.cms", "-inform", "DER",
+        "-CAfile", catfile($smdir, "smroot.pem"), "-out", "{output}.txt" ],
+      \&final_compare
+    ],
+
+    [ "signed content DER format, RSA key, SHA256 md, CAdES-BES compatible",
+      [ "{cmd1}", @prov, "-sign", "-cades", "-md", "sha256", "-in", $smcont, "-outform",
+        "DER", "-nodetach", "-certfile", catfile($smdir, "smroot.pem"),
+        "-signer", catfile($smdir, "smrsa1.pem"), "-out", "{output}.cms" ],
+      [ "{cmd2}", @prov, "-verify", "-cades", "-in", "{output}.cms", "-inform", "DER",
+        "-CAfile", catfile($smdir, "smroot.pem"), "-out", "{output}.txt" ],
+      \&final_compare
+    ],
+
+    [ "signed content DER format, RSA key, SHA512 md, CAdES-BES compatible",
+      [ "{cmd1}", @prov, "-sign", "-cades", "-md", "sha512", "-in", $smcont, "-outform",
+        "DER", "-nodetach", "-certfile", catfile($smdir, "smroot.pem"),
+        "-signer", catfile($smdir, "smrsa1.pem"), "-out", "{output}.cms" ],
+      [ "{cmd2}", @prov, "-verify", "-cades", "-in", "{output}.cms", "-inform", "DER",
+        "-CAfile", catfile($smdir, "smroot.pem"), "-out", "{output}.txt" ],
+      \&final_compare
+    ],
+
+    [ "signed content DER format, RSA key, SHA256 md, CAdES-BES compatible",
+      [ "{cmd1}", @prov, "-sign", "-cades", "-binary",  "-nodetach", "-nosmimecap", "-md", "sha256",
+        "-in", $smcont, "-outform", "DER", 
+        "-certfile", catfile($smdir, "smroot.pem"),
+        "-signer", catfile($smdir, "smrsa1.pem"),
+        "-outform", "DER", "-out", "{output}.cms"  ],
+      [ "{cmd2}", @prov, "-verify", "-cades", "-in", "{output}.cms", "-inform", "DER",
+        "-CAfile", catfile($smdir, "smroot.pem"), "-out", "{output}.txt" ],
+      \&final_compare
+    ],
+
+    [ "resigned content DER format, RSA key, SHA256 md, CAdES-BES compatible",
+      [ "{cmd1}", @prov, "-sign", "-cades", "-binary",  "-nodetach", "-nosmimecap", "-md", "sha256",
+        "-in", $smcont, "-outform", "DER", 
+        "-certfile", catfile($smdir, "smroot.pem"),
+        "-signer", catfile($smdir, "smrsa1.pem"),
+        "-outform", "DER", "-out", "{output}.cms"  ],
+      [ "{cmd1}", @prov, "-resign", "-cades", "-binary", "-nodetach", "-nosmimecap", "-md", "sha256",
+        "-inform", "DER", "-in", "{output}.cms",
+        "-certfile", catfile($smdir, "smroot.pem"),
+        "-signer", catfile($smdir, "smrsa2.pem"),
+        "-outform", "DER", "-out", "{output}2.cms" ],
+
+      [ "{cmd2}", @prov, "-verify", "-cades", "-in", "{output}2.cms", "-inform", "DER",
+        "-CAfile", catfile($smdir, "smroot.pem"), "-out", "{output}.txt" ],
+      \&final_compare
+    ],
+);
 
+my @smime_cms_cades_ko_tests = (
+    [ "signed content DER format, RSA key, but verified as CAdES-BES compatible",
+      [ @prov, "-sign", "-in", $smcont, "-outform", "DER", "-nodetach",
+        "-certfile", catfile($smdir, "smroot.pem"),
+        "-signer", catfile($smdir, "smrsa1.pem"), "-out", "{output}.cms" ],
+      [ @prov, "-verify", "-cades", "-in", "{output}.cms", "-inform", "DER",
+        "-CAfile", catfile($smdir, "smroot.pem"), "-out", "{output}.txt" ],
+      \&final_compare
+    ]
+);
+
+# cades options test - check that some combinations are rejected
+my @smime_cms_cades_invalid_option_tests = (
+    [
+        [ "-cades", "-noattr" ],
+    ],[
+        [ "-verify", "-cades", "-noattr" ],
+    ],[
+        [ "-verify", "-cades", "-noverify" ],
+    ],
 );
 
 my @smime_cms_comp_tests = (
 
     [ "compressed content test streaming PEM format",
-      [ "-compress", "-in", $smcont, "-outform", "PEM", "-nodetach",
-       "-stream", "-out", "test.cms" ],
-      [ "-uncompress", "-in", "test.cms", "-inform", "PEM", "-out", "smtst.txt" ]
+      [ "{cmd1}", @prov, "-compress", "-in", $smcont, "-outform", "PEM", "-nodetach",
+        "-stream", "-out", "{output}.cms" ],
+      [ "{cmd2}", @prov, "-uncompress", "-in", "{output}.cms", "-inform", "PEM",
+        "-out", "{output}.txt" ],
+      \&final_compare
     ]
 
 );
 
 my @smime_cms_param_tests = (
     [ "signed content test streaming PEM format, RSA keys, PSS signature",
-      [ "-sign", "-in", $smcont, "-outform", "PEM", "-nodetach",
-       "-signer", catfile($smdir, "smrsa1.pem"), "-keyopt", "rsa_padding_mode:pss",
-       "-out", "test.cms" ],
-      [ "-verify", "-in", "test.cms", "-inform", "PEM",
-       "-CAfile", catfile($smdir, "smroot.pem"), "-out", "smtst.txt" ]
+      [ "{cmd1}", @prov, "-sign", "-in", $smcont, "-outform", "PEM", "-nodetach",
+        "-signer", catfile($smdir, "smrsa1.pem"),
+        "-keyopt", "rsa_padding_mode:pss",
+        "-out", "{output}.cms" ],
+      [ "{cmd2}", @prov, "-verify", "-in", "{output}.cms", "-inform", "PEM",
+        "-CAfile", catfile($smdir, "smroot.pem"), "-out", "{output}.txt" ],
+      \&final_compare
+    ],
+
+    [ "signed content test streaming PEM format, RSA keys, PSS signature, saltlen=max",
+      [ "{cmd1}", @prov, "-sign", "-in", $smcont, "-outform", "PEM", "-nodetach",
+        "-signer", catfile($smdir, "smrsa1.pem"),
+        "-keyopt", "rsa_padding_mode:pss", "-keyopt", "rsa_pss_saltlen:max",
+        "-out", "{output}.cms" ],
+      [ "{cmd2}", @prov, "-verify", "-in", "{output}.cms", "-inform", "PEM",
+        "-CAfile", catfile($smdir, "smroot.pem"), "-out", "{output}.txt" ],
+      \&final_compare
     ],
 
     [ "signed content test streaming PEM format, RSA keys, PSS signature, no attributes",
-      [ "-sign", "-in", $smcont, "-outform", "PEM", "-nodetach", "-noattr",
-       "-signer", catfile($smdir, "smrsa1.pem"), "-keyopt", "rsa_padding_mode:pss",
-       "-out", "test.cms" ],
-      [ "-verify", "-in", "test.cms", "-inform", "PEM",
-       "-CAfile", catfile($smdir, "smroot.pem"), "-out", "smtst.txt" ]
+      [ "{cmd1}", @prov, "-sign", "-in", $smcont, "-outform", "PEM", "-nodetach",
+        "-noattr",
+        "-signer", catfile($smdir, "smrsa1.pem"),
+        "-keyopt", "rsa_padding_mode:pss",
+        "-out", "{output}.cms" ],
+      [ "{cmd2}", @prov, "-verify", "-in", "{output}.cms", "-inform", "PEM",
+        "-CAfile", catfile($smdir, "smroot.pem"), "-out", "{output}.txt" ],
+      \&final_compare
     ],
 
     [ "signed content test streaming PEM format, RSA keys, PSS signature, SHA384 MGF1",
-      [ "-sign", "-in", $smcont, "-outform", "PEM", "-nodetach",
-       "-signer", catfile($smdir, "smrsa1.pem"), "-keyopt", "rsa_padding_mode:pss",
-       "-keyopt", "rsa_mgf1_md:sha384", "-out", "test.cms" ],
-      [ "-verify", "-in", "test.cms", "-inform", "PEM",
-       "-CAfile", catfile($smdir, "smroot.pem"), "-out", "smtst.txt" ]
+      [ "{cmd1}", @prov, "-sign", "-in", $smcont, "-outform", "PEM", "-nodetach",
+        "-signer", catfile($smdir, "smrsa1.pem"),
+        "-keyopt", "rsa_padding_mode:pss", "-keyopt", "rsa_mgf1_md:sha384",
+        "-out", "{output}.cms" ],
+      [ "{cmd2}", @prov, "-verify", "-in", "{output}.cms", "-inform", "PEM",
+        "-CAfile", catfile($smdir, "smroot.pem"), "-out", "{output}.txt" ],
+      \&final_compare
+    ],
+
+    [ "enveloped content test streaming S/MIME format, DES, OAEP default parameters",
+      [ "{cmd1}", @defaultprov, "-encrypt", "-in", $smcont,
+        "-stream", "-out", "{output}.cms",
+        "-recip", catfile($smdir, "smrsa1.pem"),
+        "-keyopt", "rsa_padding_mode:oaep" ],
+      [ "{cmd2}", @defaultprov, "-decrypt", "-recip", catfile($smdir, "smrsa1.pem"),
+        "-in", "{output}.cms", "-out", "{output}.txt" ],
+      \&final_compare
+    ],
+
+    [ "enveloped content test streaming S/MIME format, DES, OAEP SHA256",
+      [ "{cmd1}", @defaultprov, "-encrypt", "-in", $smcont,
+        "-stream", "-out", "{output}.cms",
+        "-recip", catfile($smdir, "smrsa1.pem"),
+        "-keyopt", "rsa_padding_mode:oaep",
+        "-keyopt", "rsa_oaep_md:sha256" ],
+      [ "{cmd2}", @defaultprov, "-decrypt", "-recip", catfile($smdir, "smrsa1.pem"),
+        "-in", "{output}.cms", "-out", "{output}.txt" ],
+      \&final_compare
+    ],
+
+    [ "enveloped content test streaming S/MIME format, DES, ECDH",
+      [ "{cmd1}", @defaultprov, "-encrypt", "-in", $smcont,
+        "-stream", "-out", "{output}.cms",
+        "-recip", catfile($smdir, "smec1.pem") ],
+      [ "{cmd2}", @defaultprov, "-decrypt", "-recip", catfile($smdir, "smec1.pem"),
+        "-in", "{output}.cms", "-out", "{output}.txt" ],
+      \&final_compare
+    ],
+
+    [ "enveloped content test streaming S/MIME format, DES, ECDH, 2 recipients, key only used",
+      [ "{cmd1}", @defaultprov, "-encrypt", "-in", $smcont,
+        "-stream", "-out", "{output}.cms",
+        catfile($smdir, "smec1.pem"),
+        catfile($smdir, "smec3.pem") ],
+      [ "{cmd2}", @defaultprov, "-decrypt", "-inkey", catfile($smdir, "smec3.pem"),
+        "-in", "{output}.cms", "-out", "{output}.txt" ],
+      \&final_compare
+    ],
+
+    [ "enveloped content test streaming S/MIME format, ECDH, DES, key identifier",
+      [ "{cmd1}", @defaultprov, "-encrypt", "-keyid", "-in", $smcont,
+        "-stream", "-out", "{output}.cms",
+        "-recip", catfile($smdir, "smec1.pem") ],
+      [ "{cmd2}", @defaultprov, "-decrypt", "-recip", catfile($smdir, "smec1.pem"),
+        "-in", "{output}.cms", "-out", "{output}.txt" ],
+      \&final_compare
+    ],
+
+    [ "enveloped content test streaming S/MIME format, ECDH, AES-128-CBC, SHA256 KDF",
+      [ "{cmd1}", @prov, "-encrypt", "-in", $smcont,
+        "-stream", "-out", "{output}.cms",
+        "-recip", catfile($smdir, "smec1.pem"), "-aes128",
+        "-keyopt", "ecdh_kdf_md:sha256" ],
+      [ "{cmd2}", @prov, "-decrypt", "-recip", catfile($smdir, "smec1.pem"),
+        "-in", "{output}.cms", "-out", "{output}.txt" ],
+      \&final_compare
+    ],
+
+    [ "enveloped content test streaming S/MIME format, ECDH, AES-128-GCM cipher, SHA256 KDF",
+      [ "{cmd1}", @prov, "-encrypt", "-in", $smcont,
+        "-stream", "-out", "{output}.cms",
+        "-recip", catfile($smdir, "smec1.pem"), "-aes-128-gcm", "-keyopt", "ecdh_kdf_md:sha256" ],
+      [ "{cmd2}", "-decrypt", "-recip", catfile($smdir, "smec1.pem"),
+        "-in", "{output}.cms", "-out", "{output}.txt" ],
+      \&final_compare
     ],
 
-    [ "enveloped content test streaming S/MIME format, OAEP default parameters",
-      [ "-encrypt", "-in", $smcont,
-       "-stream", "-out", "test.cms",
-       "-recip", catfile($smdir, "smrsa1.pem"), "-keyopt", "rsa_padding_mode:oaep" ],
-      [ "-decrypt", "-recip", catfile($smdir, "smrsa1.pem"),
-       "-in", "test.cms", "-out", "smtst.txt" ]
+    [ "enveloped content test streaming S/MIME format, ECDH, K-283, cofactor DH",
+      [ "{cmd1}", @prov, "-encrypt", "-in", $smcont,
+        "-stream", "-out", "{output}.cms",
+        "-recip", catfile($smdir, "smec2.pem"), "-aes128",
+        "-keyopt", "ecdh_kdf_md:sha256", "-keyopt", "ecdh_cofactor_mode:1" ],
+      [ "{cmd2}", @prov, "-decrypt", "-recip", catfile($smdir, "smec2.pem"),
+        "-in", "{output}.cms", "-out", "{output}.txt" ],
+      \&final_compare
     ],
 
-    [ "enveloped content test streaming S/MIME format, OAEP SHA256",
-      [ "-encrypt", "-in", $smcont,
-       "-stream", "-out", "test.cms",
-       "-recip", catfile($smdir, "smrsa1.pem"), "-keyopt", "rsa_padding_mode:oaep",
-       "-keyopt", "rsa_oaep_md:sha256" ],
-      [ "-decrypt", "-recip", catfile($smdir, "smrsa1.pem"),
-       "-in", "test.cms", "-out", "smtst.txt" ]
-    ],
+    [ "enveloped content test streaming S/MIME format, X9.42 DH",
+      [ "{cmd1}", @prov, "-encrypt", "-in", $smcont,
+        "-stream", "-out", "{output}.cms",
+        "-recip", catfile($smdir, "smdh.pem"), "-aes128" ],
+      [ "{cmd2}", @prov, "-decrypt", "-recip", catfile($smdir, "smdh.pem"),
+        "-in", "{output}.cms", "-out", "{output}.txt" ],
+      \&final_compare
+    ]
+);
 
-    [ "enveloped content test streaming S/MIME format, ECDH",
-      [ "-encrypt", "-in", $smcont,
-       "-stream", "-out", "test.cms",
-       "-recip", catfile($smdir, "smec1.pem") ],
-      [ "-decrypt", "-recip", catfile($smdir, "smec1.pem"),
-       "-in", "test.cms", "-out", "smtst.txt" ]
+my @contenttype_cms_test = (
+    [ "signed content test - check that content type is added to additional signerinfo, RSA keys",
+      [ "{cmd1}", @prov, "-sign", "-binary", "-nodetach", "-stream", "-in", $smcont,
+        "-outform", "DER",
+        "-signer", catfile($smdir, "smrsa1.pem"), "-md", "SHA256",
+        "-out", "{output}.cms" ],
+      [ "{cmd1}", @prov, "-resign", "-binary", "-nodetach", "-in", "{output}.cms",
+        "-inform", "DER", "-outform", "DER",
+        "-signer", catfile($smdir, "smrsa2.pem"), "-md", "SHA256",
+        "-out", "{output}2.cms" ],
+      sub { my %opts = @_; contentType_matches("$opts{output}2.cms") == 2; },
+      [ "{cmd2}", @prov, "-verify", "-in", "{output}2.cms", "-inform", "DER",
+        "-CAfile", catfile($smdir, "smroot.pem"), "-out", "{output}.txt" ]
     ],
+);
 
-    [ "enveloped content test streaming S/MIME format, ECDH, key identifier",
-      [ "-encrypt", "-keyid", "-in", $smcont,
-       "-stream", "-out", "test.cms",
-       "-recip", catfile($smdir, "smec1.pem") ],
-      [ "-decrypt", "-recip", catfile($smdir, "smec1.pem"),
-       "-in", "test.cms", "-out", "smtst.txt" ]
-    ],
+my @incorrect_attribute_cms_test = (
+    "bad_signtime_attr.cms",
+    "no_ct_attr.cms",
+    "no_md_attr.cms",
+    "ct_multiple_attr.cms"
+);
 
-    [ "enveloped content test streaming S/MIME format, ECDH, AES128, SHA256 KDF",
-      [ "-encrypt", "-in", $smcont,
-       "-stream", "-out", "test.cms",
-       "-recip", catfile($smdir, "smec1.pem"), "-aes128", "-keyopt", "ecdh_kdf_md:sha256" ],
-      [ "-decrypt", "-recip", catfile($smdir, "smec1.pem"),
-       "-in", "test.cms", "-out", "smtst.txt" ]
-    ],
+# Runs a standard loop on the input array
+sub runner_loop {
+    my %opts = ( @_ );
+    my $cnt1 = 0;
 
-    [ "enveloped content test streaming S/MIME format, ECDH, K-283, cofactor DH",
-      [ "-encrypt", "-in", $smcont,
-       "-stream", "-out", "test.cms",
-       "-recip", catfile($smdir, "smec2.pem"), "-aes128",
-       "-keyopt", "ecdh_kdf_md:sha256", "-keyopt", "ecdh_cofactor_mode:1" ],
-      [ "-decrypt", "-recip", catfile($smdir, "smec2.pem"),
-       "-in", "test.cms", "-out", "smtst.txt" ]
-    ],
+    foreach (@{$opts{tests}}) {
+        $cnt1++;
+        $opts{output} = "$opts{prefix}-$cnt1";
+      SKIP: {
+          my $skip_reason = check_availability($$_[0]);
+          skip $skip_reason, 1 if $skip_reason;
+          my $ok = 1;
+          1 while unlink "$opts{output}.txt";
+
+          foreach (@$_[1..$#$_]) {
+              if (ref $_ eq 'CODE') {
+                  $ok &&= $_->(%opts);
+              } else {
+                  my @cmd = map {
+                      my $x = $_;
+                      while ($x =~ /\{([^\}]+)\}/) {
+                          $x = $`.$opts{$1}.$' if exists $opts{$1};
+                      }
+                      $x;
+                  } @$_;
+
+                  diag "CMD: openssl ", join(" ", @cmd);
+                  $ok &&= run(app(["openssl", @cmd]));
+                  $opts{input} = $opts{output};
+              }
+          }
+
+          ok($ok, $$_[0]);
+        }
+    }
+}
 
-    [ "enveloped content test streaming S/MIME format, X9.42 DH",
-      [ "-encrypt", "-in", $smcont,
-       "-stream", "-out", "test.cms",
-       "-recip", catfile($smdir, "smdh.pem"), "-aes128" ],
-      [ "-decrypt", "-recip", catfile($smdir, "smdh.pem"),
-       "-in", "test.cms", "-out", "smtst.txt" ]
-    ]
-    );
+sub final_compare {
+    my %opts = @_;
+
+    diag "Comparing $smcont with $opts{output}.txt";
+    return compare_text($smcont, "$opts{output}.txt") == 0;
+}
+
+sub zero_compare {
+    my %opts = @_;
+
+    diag "Checking for zero-length file";
+    return (-e "$opts{output}.txt" && -z "$opts{output}.txt");
+}
 
 subtest "CMS => PKCS#7 compatibility tests\n" => sub {
     plan tests => scalar @smime_pkcs7_tests;
 
-    foreach (@smime_pkcs7_tests) {
-      SKIP: {
-         my $skip_reason = check_availability($$_[0]);
-         skip $skip_reason, 1 if $skip_reason;
-
-         ok(run(app(["openssl", "cms", @{$$_[1]}]))
-            && run(app(["openssl", "smime", @{$$_[2]}]))
-            && compare_text($smcont, "smtst.txt") == 0,
-            $$_[0]);
-       }
-    }
+    runner_loop(prefix => 'cms2pkcs7', cmd1 => 'cms', cmd2 => 'smime',
+                tests => [ @smime_pkcs7_tests ]);
 };
 subtest "CMS <= PKCS#7 compatibility tests\n" => sub {
     plan tests => scalar @smime_pkcs7_tests;
 
-    foreach (@smime_pkcs7_tests) {
-      SKIP: {
-         my $skip_reason = check_availability($$_[0]);
-         skip $skip_reason, 1 if $skip_reason;
-
-         ok(run(app(["openssl", "smime", @{$$_[1]}]))
-            && run(app(["openssl", "cms", @{$$_[2]}]))
-            && compare_text($smcont, "smtst.txt") == 0,
-            $$_[0]);
-       }
-    }
+    runner_loop(prefix => 'pkcs72cms', cmd1 => 'smime', cmd2 => 'cms',
+                tests => [ @smime_pkcs7_tests ]);
 };
 
 subtest "CMS <=> CMS consistency tests\n" => sub {
     plan tests => (scalar @smime_pkcs7_tests) + (scalar @smime_cms_tests);
 
-    foreach (@smime_pkcs7_tests) {
-      SKIP: {
-         my $skip_reason = check_availability($$_[0]);
-         skip $skip_reason, 1 if $skip_reason;
-
-         ok(run(app(["openssl", "cms", @{$$_[1]}]))
-            && run(app(["openssl", "cms", @{$$_[2]}]))
-            && compare_text($smcont, "smtst.txt") == 0,
-            $$_[0]);
-       }
-    }
-    foreach (@smime_cms_tests) {
-      SKIP: {
-         my $skip_reason = check_availability($$_[0]);
-         skip $skip_reason, 1 if $skip_reason;
-
-         ok(run(app(["openssl", "cms", @{$$_[1]}]))
-            && run(app(["openssl", "cms", @{$$_[2]}]))
-            && compare_text($smcont, "smtst.txt") == 0,
-            $$_[0]);
-       }
-    }
+    runner_loop(prefix => 'cms2cms-1', cmd1 => 'cms', cmd2 => 'cms',
+                tests => [ @smime_pkcs7_tests ]);
+    runner_loop(prefix => 'cms2cms-2', cmd1 => 'cms', cmd2 => 'cms',
+                tests => [ @smime_cms_tests ]);
 };
 
 subtest "CMS <=> CMS consistency tests, modified key parameters\n" => sub {
     plan tests =>
-       (scalar @smime_cms_param_tests) + (scalar @smime_cms_comp_tests);
-
-    foreach (@smime_cms_param_tests) {
-      SKIP: {
-         my $skip_reason = check_availability($$_[0]);
-         skip $skip_reason, 1 if $skip_reason;
-
-         ok(run(app(["openssl", "cms", @{$$_[1]}]))
-            && run(app(["openssl", "cms", @{$$_[2]}]))
-            && compare_text($smcont, "smtst.txt") == 0,
-            $$_[0]);
-       }
-    }
+        (scalar @smime_cms_param_tests) + (scalar @smime_cms_comp_tests);
 
+    runner_loop(prefix => 'cms2cms-mod', cmd1 => 'cms', cmd2 => 'cms',
+                tests => [ @smime_cms_param_tests ]);
   SKIP: {
       skip("Zlib not supported: compression tests skipped",
-          scalar @smime_cms_comp_tests)
-         unless grep /ZLIB/, run(app(["openssl", "version", "-f"]),
-                                 capture => 1);
-
-      foreach (@smime_cms_param_tests) {
-       SKIP: {
-           my $skip_reason = check_availability($$_[0]);
-           skip $skip_reason, 1 if $skip_reason;
-
-           ok(run(app(["openssl", "cms", @{$$_[1]}]))
-              && run(app(["openssl", "cms", @{$$_[2]}]))
-              && compare_text($smcont, "smtst.txt") == 0,
-              $$_[0]);
-         }
-      }
+           scalar @smime_cms_comp_tests)
+          if $no_zlib;
+
+      runner_loop(prefix => 'cms2cms-comp', cmd1 => 'cms', cmd2 => 'cms',
+                  tests => [ @smime_cms_comp_tests ]);
+    }
+};
+
+# Returns the number of matches of a Content Type Attribute in a binary file.
+sub contentType_matches {
+  # Read in a binary file
+  my ($in) = @_;
+  open (HEX_IN, "$in") or die("open failed for $in : $!");
+  binmode(HEX_IN);
+  local $/;
+  my $str = <HEX_IN>;
+
+  # Find ASN1 data for a Content Type Attribute (with a OID of PKCS7 data)
+  my @c = $str =~ /\x30\x18\x06\x09\x2A\x86\x48\x86\xF7\x0D\x01\x09\x03\x31\x0B\x06\x09\x2A\x86\x48\x86\xF7\x0D\x01\x07\x01/gs;
+
+  close(HEX_IN);
+  return scalar(@c);
+}
+
+subtest "CMS Check the content type attribute is added for additional signers\n" => sub {
+    plan tests => (scalar @contenttype_cms_test);
+
+    runner_loop(prefix => 'cms2cms-added', cmd1 => 'cms', cmd2 => 'cms',
+                tests => [ @contenttype_cms_test ]);
+};
+
+subtest "CMS Check that bad attributes fail when verifying signers\n" => sub {
+    plan tests =>
+        (scalar @incorrect_attribute_cms_test);
+
+    my $cnt = 0;
+    foreach my $name (@incorrect_attribute_cms_test) {
+        my $out = "incorrect-$cnt.txt";
+
+        ok(!run(app(["openssl", "cms", @prov, "-verify", "-in",
+                     catfile($datadir, $name), "-inform", "DER", "-CAfile",
+                     catfile($smdir, "smroot.pem"), "-out", $out ])),
+            $name);
+    }
+};
+
+subtest "CMS Decrypt message encrypted with OpenSSL 1.1.1\n" => sub {
+    plan tests => 1;
+
+    SKIP: {
+        skip "EC or DES isn't supported in this build", 1
+            if disabled("ec") || disabled("des");
+
+        my $out = "smtst.txt";
+
+        ok(run(app(["openssl", "cms", @defaultprov, "-decrypt",
+                    "-inkey", catfile($smdir, "smec3.pem"),
+                    "-in", catfile($datadir, "ciphertext_from_1_1_1.cms"),
+                    "-out", $out ]))
+           && compare_text($smcont, $out) == 0,
+           "Decrypt message from OpenSSL 1.1.1");
     }
 };
 
-unlink "test.cms";
-unlink "test2.cms";
-unlink "smtst.txt";
+subtest "CAdES <=> CAdES consistency tests\n" => sub {
+    plan tests => (scalar @smime_cms_cades_tests);
+
+    runner_loop(prefix => 'cms-cades', cmd1 => 'cms', cmd2 => 'cms',
+                tests => [ @smime_cms_cades_tests ]);
+};
+
+subtest "CAdES; cms incompatible arguments tests\n" => sub {
+    plan tests => (scalar @smime_cms_cades_invalid_option_tests);
+
+    foreach (@smime_cms_cades_invalid_option_tests) {
+        ok(!run(app(["openssl", "cms", @{$$_[0]} ] )));
+    }
+};
+
+subtest "CAdES ko tests\n" => sub {
+    plan tests => (scalar @smime_cms_cades_ko_tests);
+
+    foreach (@smime_cms_cades_ko_tests) {
+      SKIP: {
+        my $skip_reason = check_availability($$_[0]);
+        skip $skip_reason, 1 if $skip_reason;
+
+        ok(run(app(["openssl", "cms", @{$$_[1]}]))
+            && !run(app(["openssl", "cms", @{$$_[2]}])),
+            $$_[0]);
+        }
+    }
+};
 
 sub check_availability {
     my $tnam = shift;
 
     return "$tnam: skipped, EC disabled\n"
-       if ($no_ec && $tnam =~ /ECDH/);
+        if ($no_ec && $tnam =~ /ECDH/);
     return "$tnam: skipped, ECDH disabled\n"
-       if ($no_ecdh && $tnam =~ /ECDH/);
+        if ($no_ec && $tnam =~ /ECDH/);
     return "$tnam: skipped, EC2M disabled\n"
-       if ($no_ec2m && $tnam =~ /K-283/);
+        if ($no_ec2m && $tnam =~ /K-283/);
+    return "$tnam: skipped, DH disabled\n"
+        if ($no_dh && $tnam =~ /X9\.42/);
+    return "$tnam: skipped, RC2 disabled\n"
+        if ($no_rc2 && $tnam =~ /RC2/);
+    return "$tnam: skipped, DES disabled\n"
+        if ($no_des && $tnam =~ /DES/);
+    return "$tnam: skipped, DSA disabled\n"
+        if ($no_dsa && $tnam =~ / DSA/);
+
     return "";
 }