httpd-test-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject cvs commit: httpd-test/perl-framework/Apache-Test Changes
Date Tue, 12 Aug 2003 19:26:41 GMT
stas        2003/08/12 12:26:41

  Modified:    perl-framework/Apache-Test/lib/Apache TestSSLCA.pm
               perl-framework/Apache-Test Changes
  Log:
  fix Apache::TestSSLCA to generate a separate index.txt file for each
  module, as on certain platforms openssl fails to re-use the same
  file.
  
  Revision  Changes    Path
  1.14      +12 -5     httpd-test/perl-framework/Apache-Test/lib/Apache/TestSSLCA.pm
  
  Index: TestSSLCA.pm
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/TestSSLCA.pm,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- TestSSLCA.pm	9 Feb 2003 23:06:07 -0000	1.13
  +++ TestSSLCA.pm	12 Aug 2003 19:26:41 -0000	1.14
  @@ -172,7 +172,9 @@
       return $file if -e $file;
   
       my $dn = dn($name);
  -    my $db = SSLCA_DB;
  +    my $db = sslca_db($name);
  +
  +    writefile($db, '', 1);
   
       writefile($file, <<EOF);
   [ req ]
  @@ -245,7 +247,6 @@
   my $digest_auth_hash    = '$1$OXLyS...$Owx8s2/m9/gfkcRVXzgoE/';
   
   sub new_ca {
  -    writefile(SSLCA_DB, '', 1);
       writefile('serial', "01\n", 1);
   
       writefile('ssl.htpasswd',
  @@ -306,6 +307,11 @@
                         "-out export/$name.p12", $passin, $passout;
   }
   
  +sub sslca_db {
  +    my $name = shift;
  +    return "$name-" . SSLCA_DB;
  +}
  +
   sub revoke_cert {
       my $name = shift;
   
  @@ -314,11 +320,12 @@
       #revokes in the SSLCA_DB database
       openssl ca => "-revoke certs/$name.crt", @args;
   
  -    unless (-e SSLCA_DB) {
  +    my $db = sslca_db($name);
  +    unless (-e $db) {
           #hack required for win32
  -        my $new = join '.', SSLCA_DB, 'new';
  +        my $new = join '.', $db, 'new';
           if (-e $new) {
  -            cp $new, SSLCA_DB;
  +            cp $new, $db;
           }
       }
   
  
  
  
  1.39      +4 -0      httpd-test/perl-framework/Apache-Test/Changes
  
  Index: Changes
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/Changes,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- Changes	11 Aug 2003 20:07:07 -0000	1.38
  +++ Changes	12 Aug 2003 19:26:41 -0000	1.39
  @@ -8,6 +8,10 @@
   
   =item 1.04-dev - 
   
  +fix Apache::TestSSLCA to generate a separate index.txt file for each
  +module, as on certain platforms openssl fails to re-use the same
  +file. [Stas]
  +
   remove the unused example section from t/conf/extra.conf.in, it made
   an assumption that mod_auth is available [Stas]
   
  
  
  

Mime
View raw message