diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2008-03-31 15:03:55 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2008-03-31 15:03:55 +0000 |
commit | 2e86f0d8d7185993d8cca5158af61d13224c3c26 (patch) | |
tree | 308131c49aba8045da575d2f25c184a21073f96b /test | |
parent | e2a29d49ca8548f95ec1b92f2f443f0f9f416a58 (diff) |
Use correct headers for signed receipts. Use consistent naming.
Update cms-test.pl to support OpenSSL 0.9.8.
Diffstat (limited to 'test')
-rw-r--r-- | test/cms-test.pl | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/test/cms-test.pl b/test/cms-test.pl index db272e4d66..254f11c630 100644 --- a/test/cms-test.pl +++ b/test/cms-test.pl @@ -74,6 +74,7 @@ my $smdir = "smime-certs"; my $halt_err = 1; my $badcmd = 0; +my $ossl8 = `$ossl_path version -v` =~ /0\.9\.8/; my @smime_pkcs7_tests = ( @@ -333,6 +334,8 @@ else { print "Zlib not supported: compression tests skipped\n"; } +print "Running modified tests for OpenSSL 0.9.8 cms backport\n" if($ossl8); + if ($badcmd) { print "$badcmd TESTS FAILED!!\n"; } @@ -351,6 +354,15 @@ sub run_smime_tests { foreach $smtst (@$aref) { my ( $tnam, $rscmd, $rvcmd ) = @$smtst; + if ($ossl8) + { + # Skip smime resign: 0.9.8 smime doesn't support -resign + next if ($scmd =~ /smime/ && $rscmd =~ /-resign/); + # Disable streaming: option not supported in 0.9.8 + $tnam =~ s/streaming//; + $rscmd =~ s/-stream//; + $rvcmd =~ s/-stream//; + } system("$scmd$rscmd 2>cms.err 1>cms.out"); if ($?) { print "$tnam: generation error\n"; |