dougm 02/01/28 18:16:43
Modified: perl-framework/Apache-Test/lib/Apache TestSSLCA.pm
perl-framework/t/conf/ssl ssl.conf.in
perl-framework/t/ssl env.t varlookup.t
Log:
change CA cert/key files to use the test naming conventions:
cacert.crt => ca.crt
cakey.pem => ca.pem
export the CA cert to export/ca.p12; useful for importing into IE.
Revision Changes Path
1.7 +5 -3
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestSSLCA.pm 21 Dec 2001 23:06:49 -0000 1.6
+++ TestSSLCA.pm 29 Jan 2002 02:16:43 -0000 1.7
@@ -23,8 +23,8 @@
my $Config; #global Apache::TestConfig object
my $days = '-days 365';
-my $cakey = 'keys/cakey.pem';
-my $cacert = 'certs/cacert.crt';
+my $cakey = 'keys/ca.pem';
+my $cacert = 'certs/ca.crt';
my $capolicy = '-policy policy_anything';
my $cacrl = 'crl/ca-bundle.crl';
@@ -215,7 +215,9 @@
$basic_auth_password);
openssl req => "-new -x509 -keyout $cakey -out $cacert $days",
- config('cacert');
+ config('ca');
+
+ export_cert('ca'); #useful for importing into IE
}
sub new_key {
1.16 +1 -1 httpd-test/perl-framework/t/conf/ssl/ssl.conf.in
Index: ssl.conf.in
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/t/conf/ssl/ssl.conf.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ssl.conf.in 23 Jan 2002 22:02:24 -0000 1.15
+++ ssl.conf.in 29 Jan 2002 02:16:43 -0000 1.16
@@ -38,7 +38,7 @@
#SSLCertificateChainFile @SSLCA@/asf/certs/cachain.crt
- SSLCACertificateFile @SSLCA@/asf/certs/cacert.crt
+ SSLCACertificateFile @SSLCA@/asf/certs/ca.crt
SSLCARevocationFile @SSLCA@/asf/crl/ca-bundle.crl
1.6 +1 -1 httpd-test/perl-framework/t/ssl/env.t
Index: env.t
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/t/ssl/env.t,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- env.t 21 Dec 2001 23:42:22 -0000 1.5
+++ env.t 29 Jan 2002 02:16:43 -0000 1.6
@@ -8,7 +8,7 @@
my $cert = 'client_snakeoil';
my $server_expect =
- Apache::TestSSLCA::dn_vars('cacert', 'SERVER_I');
+ Apache::TestSSLCA::dn_vars('ca', 'SERVER_I');
my $client_expect =
Apache::TestSSLCA::dn_vars($cert, 'CLIENT_S');
1.10 +1 -1 httpd-test/perl-framework/t/ssl/varlookup.t
Index: varlookup.t
===================================================================
RCS file: /home/cvs/httpd-test/perl-framework/t/ssl/varlookup.t,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- varlookup.t 20 Jan 2002 19:20:26 -0000 1.9
+++ varlookup.t 29 Jan 2002 02:16:43 -0000 1.10
@@ -26,7 +26,7 @@
my $client_dn = dn_oneline(\%client_dn);
-my %client_i_dn = dn('cacert');
+my %client_i_dn = dn('ca');
my $client_i_dn = dn_oneline(\%client_i_dn);
