OpenSSL: openssl/test/ cms-test.pl

  OpenSSL CVS Repository
  http://cvs.openssl.org/
 
____________________________________________________________
________________

  Server: cvs.openssl.org                  Name:   Dr.
Stephen Henson
  Root:   /v/openssl/cvs                   Email:  steveopenssl.org
  Module: openssl                          Date:  
18-Mar-2008 18:33:47
  Branch: HEAD                             Handle:
2008031817334600

  Modified files:
    openssl/test            cms-test.pl

  Log:
    Fixes for S/MIME consistency checker and flexibility
enhancements.

  Summary:
    Revision    Changes     Path
    1.2         +35 -24     openssl/test/cms-test.pl
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/test/cms-test.pl
 
============================================================
================
  $ cvs diff -u -r1.1 -r1.2 cms-test.pl
  --- openssl/test/cms-test.pl	18 Mar 2008 14:37:59
-0000	1.1
  +++ openssl/test/cms-test.pl	18 Mar 2008 17:33:46
-0000	1.2
   -53,11 +53,25 
   # CMS, PKCS7 consistency test script. Run extensive tests
on
   # OpenSSL PKCS#7 and CMS implementations.
   
  +my $ossl_path;
   
  -my $ossl_path = "../apps/openssl";
  -my $cmd       = "$ossl_path cms ";
  -my $cmd2      = "$ossl_path smime ";
  -my $smdir     = "smime-certs";
  +if ( -f "../apps/openssl" ) {
  +    $ossl_path = "../util/shlib_wrap.sh
../apps/openssl";
  +}
  +elsif ( -f "..\out32dll\openssl.exe" ) {
  +    $ossl_path = "..\out32dll\openssl.exe";
  +}
  +elsif ( -f "..\out32\openssl.exe" ) {
  +    $ossl_path = "..\out32\openssl.exe";
  +}
  +else {
  +    die "Can't find OpenSSL executable";
  +}
  +
  +my $pk7cmd   = "$ossl_path smime ";
  +my $cmscmd   = "$ossl_path cms ";
  +my $smdir    = "smime-certs";
  +my $halt_err = 1;
   
   my $badcmd = 0;
   
   -68,12 +82,11 
           "-sign -in smcont.txt -outform DER
-nodetach"
             . " -signer $smdir/smrsa1.pem -out
test.cms",
           "-verify -in test.cms -inform DER "
  -	  . " -CAfile $smdir/smroot.pem -out
smtst.txt"
  +          . " -CAfile $smdir/smroot.pem -out
smtst.txt"
       ],
   
       [
           "signed detached content DER format, RSA
key",
  -
           "-sign -in smcont.txt -outform DER"
             . " -signer $smdir/smrsa1.pem -out
test.cms",
           "-verify -in test.cms -inform DER "
   -85,7 +98,7 
           "-sign -in smcont.txt -outform DER
-nodetach"
             . " -stream -signer $smdir/smrsa1.pem -out
test.cms",
           "-verify -in test.cms -inform DER "
  -	  . " -CAfile $smdir/smroot.pem -out
smtst.txt"
  +          . " -CAfile $smdir/smroot.pem -out
smtst.txt"
       ],
   
       [
   -93,12 +106,11 
           "-sign -in smcont.txt -outform DER
-nodetach"
             . " -signer $smdir/smdsa1.pem -out
test.cms",
           "-verify -in test.cms -inform DER "
  -	  . " -CAfile $smdir/smroot.pem -out
smtst.txt"
  +          . " -CAfile $smdir/smroot.pem -out
smtst.txt"
       ],
   
       [
           "signed detached content DER format, DSA
key",
  -
           "-sign -in smcont.txt -outform DER"
             . " -signer $smdir/smdsa1.pem -out
test.cms",
           "-verify -in test.cms -inform DER "
   -107,7 +119,6 
   
       [
           "signed detached content DER format, add RSA
signer",
  -
           "-resign -inform DER -in test.cms -outform
DER"
             . " -signer $smdir/smrsa1.pem -out
test2.cms",
           "-verify -in test2.cms -inform DER "
   -119,7 +130,7 
           "-sign -in smcont.txt -outform DER
-nodetach"
             . " -stream -signer $smdir/smdsa1.pem -out
test.cms",
           "-verify -in test.cms -inform DER "
  -	  . " -CAfile $smdir/smroot.pem -out
smtst.txt"
  +          . " -CAfile $smdir/smroot.pem -out
smtst.txt"
       ],
   
       [
   -129,7 +140,7 
             . " -signer $smdir/smdsa1.pem -signer
$smdir/smdsa2.pem"
             . " -stream -out test.cms",
           "-verify -in test.cms -inform DER "
  -	  . " -CAfile $smdir/smroot.pem -out
smtst.txt"
  +          . " -CAfile $smdir/smroot.pem -out
smtst.txt"
       ],
   
       [
   -139,7 +150,7 
             . " -signer $smdir/smdsa1.pem -signer
$smdir/smdsa2.pem"
             . " -stream -out test.cms",
           "-verify -in test.cms -inform DER "
  -	  . " -CAfile $smdir/smroot.pem -out
smtst.txt"
  +          . " -CAfile $smdir/smroot.pem -out
smtst.txt"
       ],
   
       [
   -148,8 +159,7 
             . " -signer $smdir/smrsa1.pem -signer
$smdir/smrsa2.pem"
             . " -signer $smdir/smdsa1.pem -signer
$smdir/smdsa2.pem"
             . " -stream -out test.cms",
  -        "-verify -in test.cms "
  -	  . " -CAfile $smdir/smroot.pem -out
smtst.txt"
  +        "-verify -in test.cms " . "
-CAfile $smdir/smroot.pem -out smtst.txt"
       ],
   
       [
   -158,8 +168,7 
             . " -signer $smdir/smrsa1.pem -signer
$smdir/smrsa2.pem"
             . " -signer $smdir/smdsa1.pem -signer
$smdir/smdsa2.pem"
             . " -stream -out test.cms",
  -        "-verify -in test.cms "
  -	  . " -CAfile $smdir/smroot.pem -out
smtst.txt"
  +        "-verify -in test.cms " . "
-CAfile $smdir/smroot.pem -out smtst.txt"
       ],
   
       [
   -205,7 +214,7 
             . " -signer $smdir/smdsa1.pem -signer
$smdir/smdsa2.pem"
             . " -stream -out test.cms",
           "-verify -in test.cms -inform DER "
  -	  . " -CAfile $smdir/smroot.pem -out
smtst.txt"
  +          . " -CAfile $smdir/smroot.pem -out
smtst.txt"
       ],
   
       [
   -215,7 +224,7 
             . " -signer $smdir/smdsa1.pem -signer
$smdir/smdsa2.pem"
             . " -stream -out test.cms",
           "-verify -in test.cms -inform PEM "
  -	  . " -CAfile $smdir/smroot.pem -out
smtst.txt"
  +          . " -CAfile $smdir/smroot.pem -out
smtst.txt"
       ],
   
       [
   -277,19 +286,19 
   
   print "CMS => PKCS#7 compatibility
testsn";
   
  -run_smime_tests( $badcmd, smime_pkcs7_tests, $cmd,
$cmd2 );
  +run_smime_tests( $badcmd, smime_pkcs7_tests, $cmscmd,
$pk7cmd );
   
   print "CMS <= PKCS#7 compatibility
testsn";
   
  -run_smime_tests( $badcmd, smime_pkcs7_tests, $cmd2,
$cmd );
  +run_smime_tests( $badcmd, smime_pkcs7_tests, $pk7cmd,
$cmscmd );
   
   print "CMS <=> CMS consistency testsn";
   
  -run_smime_tests( $badcmd, smime_pkcs7_tests, $cmd,
$cmd );
  -run_smime_tests( $badcmd, smime_cms_tests,   $cmd,
$cmd );
  +run_smime_tests( $badcmd, smime_pkcs7_tests, $cmscmd,
$cmscmd );
  +run_smime_tests( $badcmd, smime_cms_tests,   $cmscmd,
$cmscmd );
   
   if ( `$ossl_path version -f` =~ /ZLIB/ ) {
  -    run_smime_tests( $badcmd, smime_cms_comp_tests, $cmd,
$cmd );
  +    run_smime_tests( $badcmd, smime_cms_comp_tests,
$cmscmd, $cmscmd );
   }
   else {
       print "Zlib not supported: compression tests
skippedn";
   -311,12 +320,14 
           if ($?) {
               print "$tnam: generation errorn";
               $$rv++;
  +            exit 1 if $halt_err;
               next;
           }
           system( $vcmd . $rvcmd );
           if ($?) {
               print "$tnam: verify errorn";
               $$rv++;
  +            exit 1 if $halt_err;
               next;
           }
           print "$tnam: OKn";
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org