Commit 2fc368c1 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Don't run ECDH CMS tests if EC disabled. 

(cherry picked from commit b85f8afe)
parent 6ed3af7d

test/cms-test.pl

+20 −0
Original line number Diff line number Diff line
@@ -82,8 +82,23 @@ my $smdir = "smime-certs"; 
my $halt_err = 1;



my $badcmd = 0;

my $no_ec;

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



system ("$ossl_path no-ec >/dev/null");

if ($? == 0)

	{

	$no_ec = 1;

	}

elsif ($? == 1)

	{

	$no_ec = 0;

	}

else

	{

	die "Error checking for EC support\n";

	}



my @smime_pkcs7_tests = (



    [
@@ -472,6 +487,11 @@ sub run_smime_tests { 
		$rscmd =~ s/-stream//;	

		$rvcmd =~ s/-stream//;

		}

	if ($no_ec && $tnam =~ /ECDH/)

		{

		print "$tnam: skipped, EC disabled\n";

		next;

		}

        system("$scmd$rscmd$redir");

        if ($?) {

            print "$tnam: generation error\n";