Commit d253c9cd authored by Matt Caswell's avatar Matt Caswell
Browse files

Fixed cms-test.pl for no-ec2m 



Reviewed-by: default avatarDr. Stephen Henson <steve@openssl.org>
parent cffeacd9

test/cms-test.pl

+21 −1
Original line number Diff line number Diff line
@@ -83,6 +83,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 >/dev/null");
@@ -99,6 +100,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 = (



    [
@@ -492,6 +507,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";