You are viewing a plain text version of this content. The canonical link for it is here.
Posted to test-cvs@httpd.apache.org by do...@apache.org on 2002/03/03 02:11:33 UTC
cvs commit: httpd-test/perl-framework/t/ssl varlookup.t
dougm 02/03/02 17:11:33
Modified: perl-framework/t/ssl varlookup.t
Log:
pattern match server OU so we can pass tests using different certs
Revision Changes Path
1.11 +5 -2 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- varlookup.t 29 Jan 2002 02:16:43 -0000 1.10
+++ varlookup.t 3 Mar 2002 01:11:33 -0000 1.11
@@ -31,6 +31,9 @@
my $client_i_dn = dn_oneline(\%client_i_dn);
my %server_dn = dn('server');
+#turn into a pattern match: httpd-test/([-\w]+)
+#so we can test with different server keys/certs
+$server_dn{OU} =~ s:^([-\w]+/)([-\w]+)$:$1([-\\w]+):;
my $server_dn = dn_oneline(\%server_dn);
@@ -145,7 +148,7 @@
SSL_CIPHER_USEKEYSIZE qr(^\d+$)
SSL_CLIENT_S_DN "$client_dn"
-SSL_SERVER_S_DN "$server_dn"
+SSL_SERVER_S_DN qr(^$server_dn$)
SSL_CLIENT_S_DN_C "$client_dn{C}"
SSL_SERVER_S_DN_C "$server_dn{C}"
SSL_CLIENT_S_DN_ST "$client_dn{ST}"
@@ -155,7 +158,7 @@
SSL_CLIENT_S_DN_O "$client_dn{O}"
SSL_SERVER_S_DN_O "$server_dn{O}"
SSL_CLIENT_S_DN_OU "$client_dn{OU}"
-SSL_SERVER_S_DN_OU "$server_dn{OU}"
+SSL_SERVER_S_DN_OU qr(^$server_dn{OU})
SSL_CLIENT_S_DN_CN "$client_dn{CN}"
SSL_SERVER_S_DN_CN "$server_dn{CN}"
SSL_CLIENT_S_DN_T