perl-test-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r1831397 - /perl/Apache-Test/trunk/lib/Apache/TestSSLCA.pm
Date Fri, 11 May 2018 09:56:40 GMT
Author: jorton
Date: Fri May 11 09:56:40 2018
New Revision: 1831397

URL: http://svn.apache.org/viewvc?rev=1831397&view=rev
Log:
Use single CA index file rather than one per issued cert.

Unclear what (OpenSSL bug?) this workaround was added for in r100968.

Modified:
    perl/Apache-Test/trunk/lib/Apache/TestSSLCA.pm

Modified: perl/Apache-Test/trunk/lib/Apache/TestSSLCA.pm
URL: http://svn.apache.org/viewvc/perl/Apache-Test/trunk/lib/Apache/TestSSLCA.pm?rev=1831397&r1=1831396&r2=1831397&view=diff
==============================================================================
--- perl/Apache-Test/trunk/lib/Apache/TestSSLCA.pm (original)
+++ perl/Apache-Test/trunk/lib/Apache/TestSSLCA.pm Fri May 11 09:56:40 2018
@@ -218,9 +218,9 @@ sub config_file {
     return $file if -e $file;
 
     my $dn = dn($name);
-    my $db = sslca_db($name);
+    my $db = SSLCA_DB;
 
-    writefile($db, '', 1);
+    writefile($db, '', 1) unless -e $db;
 
     writefile($file, <<EOF);
 mail                   = $dn->{$email_field}
@@ -369,11 +369,6 @@ sub export_cert {
                       "-out export/$name.p12", $passin, $passout;
 }
 
-sub sslca_db {
-    my $name = shift;
-    return "$name-" . SSLCA_DB;
-}
-
 sub revoke_cert {
     my $name = shift;
 
@@ -382,15 +377,6 @@ sub revoke_cert {
     #revokes in the SSLCA_DB database
     openssl ca => "-revoke certs/$name.crt", @args;
 
-    my $db = sslca_db($name);
-    unless (-e $db) {
-        #hack required for win32
-        my $new = join '.', $db, 'new';
-        if (-e $new) {
-            cp $new, $db;
-        }
-    }
-
     #generates crl from the index.txt database
     openssl ca => "-gencrl -out $cacrl", @args;
 }



Mime
View raw message