Fixed cms-test.pl for no-ec2m (5a4a9499) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

test/cms-test.pl

+21 −1

Original line number	Diff line number	Diff line
		@@ -88,6 +88,7 @@ my $halt_err = 1;

		my $badcmd = 0;
		my $no_ec;
		my $no_ec2m;
		my $ossl8 = `$ossl_path version -v` =~ /0\.9\.8/;

		system ("$ossl_path no-ec > $null_path");
		@@ -104,6 +105,20 @@ else
		die "Error checking for EC support\n";
		}

		system ("$ossl_path no-ec2m >/dev/null");
		if ($? == 0)
		{
		$no_ec2m = 1;
		}
		elsif ($? == 256)
		{
		$no_ec2m = 0;
		}
		else
		{
		die "Error checking for EC2M support\n";
		}

		my @smime_pkcs7_tests = (

		[
		@@ -497,6 +512,11 @@ sub run_smime_tests {
		print "$tnam: skipped, EC disabled\n";
		next;
		}
		if ($no_ec2m && $tnam =~ /K-283/)
		{
		print "$tnam: skipped, EC2M disabled\n";
		next;
		}
		system("$scmd$rscmd$redir");
		if ($?) {
		print "$tnam: generation error\n";