RT3998: Allow scrypt to be disabled

[openssl.git] / test / cms-test.pl

diff --git a/test/cms-test.pl b/test/cms-test.pl
index 1c3f00dc5b18d6f861ed189d2fb46896d72f4120..1ee3f02e87d591c8f2412aedf0b45b2332cb5aa9 100644 (file)
--- a/test/cms-test.pl
+++ b/test/cms-test.pl
@@ -67,7 +67,7 @@ if ( $^O eq "VMS" && -f "OSSLX:openssl.exe" ) {
 # Make MSYS work
 elsif ( $^O eq "MSWin32" && -f "../apps/openssl.exe" ) {
     $ossl_path = "cmd /c ..\\apps\\openssl";
-    $null_path = "/dev/null";
+    $null_path = "NUL";
     $failure_code = 256;
 }
 elsif ( -f "../apps/openssl$ENV{EXE_EXT}" ) {
@@ -77,12 +77,12 @@ elsif ( -f "../apps/openssl$ENV{EXE_EXT}" ) {
 }
 elsif ( -f "..\\out32dll\\openssl.exe" ) {
     $ossl_path = "..\\out32dll\\openssl.exe";
-    $null_path = "/dev/null";
+    $null_path = "NUL";
     $failure_code = 256;
 }
 elsif ( -f "..\\out32\\openssl.exe" ) {
     $ossl_path = "..\\out32\\openssl.exe";
-    $null_path = "/dev/null";
+    $null_path = "NUL";
     $failure_code = 256;
 }
 else {
@@ -100,6 +100,13 @@ my $no_ec2m;
 my $no_ecdh;
 my $ossl8 = `$ossl_path version -v` =~ /0\.9\.8/;
 
+system ("$ossl_path no-cms > $null_path");
+if ($? == 0)
+        {
+        print "CMS disabled\n";
+        exit 0;
+        }
+
 system ("$ossl_path no-ec > $null_path");
 if ($? == 0)
        {
@@ -128,7 +135,7 @@ else
        die "Error checking for EC2M support\n";
        }
 
-system ("$ossl_path no-ecdh > $null_path");
+system ("$ossl_path no-ec > $null_path");
 if ($? == 0)
        {
        $no_ecdh = 1;
@@ -452,6 +459,14 @@ my @smime_cms_param_tests = (
         "-decrypt -recip $smdir/smec1.pem -in test.cms -out smtst.txt"
     ],
 
+    [
+"enveloped content test streaming S/MIME format, ECDH, key identifier",
+        "-encrypt -keyid -in smcont.txt"
+          . " -stream -out test.cms"
+          . " -recip $smdir/smec1.pem",
+        "-decrypt -recip $smdir/smec1.pem -in test.cms -out smtst.txt"
+    ],
+
     [
 "enveloped content test streaming S/MIME format, ECDH, AES128, SHA256 KDF",
         "-encrypt -in smcont.txt"