projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Include TA in checks/callback with partial chains.
[openssl.git]
/
test
/
cms-test.pl
diff --git
a/test/cms-test.pl
b/test/cms-test.pl
index 287f4db34c749a5686185b5209dfbdb8142fe451..006733a6befeee223c0431c8a1f9a16417d0cd39 100644
(file)
--- a/
test/cms-test.pl
+++ b/
test/cms-test.pl
@@
-82,8
+82,23
@@
my $smdir = "smime-certs";
my $halt_err = 1;
my $badcmd = 0;
my $halt_err = 1;
my $badcmd = 0;
+my $no_ec;
my $ossl8 = `$ossl_path version -v` =~ /0\.9\.8/;
my $ossl8 = `$ossl_path version -v` =~ /0\.9\.8/;
+system ("$ossl_path no-ec >/dev/null");
+if ($? == 0)
+ {
+ $no_ec = 1;
+ }
+elsif ($? == 256)
+ {
+ $no_ec = 0;
+ }
+else
+ {
+ die "Error checking for EC support\n";
+ }
+
my @smime_pkcs7_tests = (
[
my @smime_pkcs7_tests = (
[
@@
-472,6
+487,11
@@
sub run_smime_tests {
$rscmd =~ s/-stream//;
$rvcmd =~ s/-stream//;
}
$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";
system("$scmd$rscmd$redir");
if ($?) {
print "$tnam: generation error\n";