OpenSSL: OpenSSL-fips-0_9_8-stable: openssl/fips/ fipsalgtest.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:  
23-Dec-2007 01:53:56
  Branch: OpenSSL-fips-0_9_8-stable        Handle:
2007122300535500

  Modified files:           (Branch:
OpenSSL-fips-0_9_8-stable)
    openssl/fips            fipsalgtest.pl

  Log:
    Initial Win32 support in fipsalgtest.pl

  Summary:
    Revision    Changes     Path
    1.1.2.2     +7  -3      openssl/fips/fipsalgtest.pl
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/fips/fipsalgtest.pl
 
============================================================
================
  $ cvs diff -u -r1.1.2.1 -r1.1.2.2 fipsalgtest.pl
  --- openssl/fips/fipsalgtest.pl	22 Dec 2007 19:31:05
-0000	1.1.2.1
  +++ openssl/fips/fipsalgtest.pl	23 Dec 2007 00:53:55
-0000	1.1.2.2
   -1,4 +1,4 
  -#!/usr/local/bin/perl -w
  +#!/usr/bin/perl -w
   # Perl utility to run or verify FIPS 140-2 CMVP algorithm
tests based on the
   # pathnames of input algorithm test files actually
present (the unqualified
   # file names are consistent but the pathnames are not).
   -394,8 +394,11 
       }
   }
   
  +
   sanity_check_exe( $win32, $tprefix, $shwrap_prefix );
   
  +my $cmd_prefix = $win32 ? "" :
"$shlib_wrap.sh ";
  +
   my %fips_files;
   
   foreach ( keys %fips_tests ) {
   -472,6 +475,7 
       }
       if ($bad) {
           print STDERR "FATAL ERROR: executables
missingn";
  +	exit (1);
       }
       elsif ($debug) {
           print STDERR "Executable sanity check passed
OKn";
   -588,7 +592,7 
               next;
           }
           my $tcmd = $fips_tests{$tname};
  -        my $cmd  = "$shlib_wrap.sh
$tprefix$tcmd ";
  +        my $cmd = "$cmd_prefix$tprefix$tcmd ";
           if ( $tcmd =~ /-f$/ ) {
               $cmd .= "$req $out";
           }
   -606,7 +610,7 
                   my $vout = $rsp;
                   $vout =~ s/.rsp$/.ver/;
                   $tcmd = $verify_special{$tname};
  -                $cmd  =
"$shlib_wrap.sh $tprefix$tcmd ";
  +                $cmd  = "$cmd_prefix$tprefix$tcmd
";
                   $cmd .= "<$out >$vout";
                   system($cmd);
                   if ( $? != 0 ) {
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org