You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by kb...@apache.org on 2015/09/27 15:08:37 UTC
svn commit: r1705535 - /httpd/test/framework/trunk/t/ssl/varlookup.t
Author: kbrand
Date: Sun Sep 27 13:08:36 2015
New Revision: 1705535
URL: http://svn.apache.org/viewvc?rev=1705535&view=rev
Log:
enable checks for the *_DN_Email variables
Modified:
httpd/test/framework/trunk/t/ssl/varlookup.t
Modified: httpd/test/framework/trunk/t/ssl/varlookup.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/ssl/varlookup.t?rev=1705535&r1=1705534&r2=1705535&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/ssl/varlookup.t (original)
+++ httpd/test/framework/trunk/t/ssl/varlookup.t Sun Sep 27 13:08:36 2015
@@ -40,6 +40,8 @@ my %server_dn = dn('server');
my $dgst = Apache::TestSSLCA::dgst();
+my $email_field = Apache::TestSSLCA::email_field();
+
# YYY will be turned into a pattern match: httpd-test/([-\w]+)
# so we can test with different server keys/certs
$server_dn{OU} = 'httpd-test/YYY';
@@ -187,8 +189,8 @@ SSL_CLIENT_S_DN_D
SSL_SERVER_S_DN_D
SSL_CLIENT_S_DN_UID
SSL_SERVER_S_DN_UID
-SSL_CLIENT_S_DN_Email
-SSL_SERVER_S_DN_Email
+SSL_CLIENT_S_DN_Email "$client_dn{$email_field}"
+SSL_SERVER_S_DN_Email "$server_dn{$email_field}"
SSL_CLIENT_I_DN "$client_i_dn"
SSL_SERVER_I_DN "$server_i_dn"
@@ -216,8 +218,8 @@ SSL_CLIENT_I_DN_D
SSL_SERVER_I_DN_D
SSL_CLIENT_I_DN_UID
SSL_SERVER_I_DN_UID
-SSL_CLIENT_I_DN_Email
-SSL_SERVER_I_DN_Email
+SSL_CLIENT_I_DN_Email "$client_i_dn{$email_field}"
+SSL_SERVER_I_DN_Email "$server_i_dn{$email_field}"
SSL_CLIENT_A_SIG "${dgst}WithRSAEncryption"
SSL_SERVER_A_SIG "${dgst}WithRSAEncryption"
SSL_CLIENT_A_KEY 'rsaEncryption'