ChangeLogTag: Mon Nov 17 11:52:38 UTC 2008 Simon McQueen <sm@prismtech.com>

8 files changed, 23 insertions, 13 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 637598e6de4..3a81c70fbc8 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,21 @@
+Mon Nov 17 11:52:38 UTC 2008  Simon McQueen  <sm@prismtech.com>
+
+        * orbsvcs/tests/Security/Secure_Invocation/client.conf:
+        * orbsvcs/tests/Security/Secure_Invocation/client.cpp:
+        * orbsvcs/tests/Security/Secure_Invocation/client_nopasswd.conf:
+        * orbsvcs/tests/Security/Secure_Invocation/server.conf:
+        * orbsvcs/tests/Security/Secure_Invocation/server.cpp:
+        * orbsvcs/tests/Security/Secure_Invocation/server_none.conf:
+        * orbsvcs/tests/Security/Secure_Invocation/server_nopasswd.conf:
+
+          In common with all our other SSL tests this test specifies the CA
+          certificate by means of an environment value. This means that we have
+          no coverage for the service configurator directive arguments
+          -SSLCAfile and -SSLCApath. This one test has now been modified to use
+          the former argument. This will expose a regression and also probably
+          errors in the wide character support revision 83118 to
+          TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp.
+
 Mon Nov 17 12:01:12 UTC 2008  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * DevGuideExamples/PortableInterceptors/PICurrent_NameService:
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.conf b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.conf
index 5847fa22a03..602c52b482e 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.conf
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.conf
@@ -1,4 +1,4 @@
 # $Id$
 
-dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem"
+dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:client_key.pem -SSLCertificate PEM:client_cert.pem -SSLCAfile PEM:cacert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
index 81d4555f2c7..1ee4e0773e2 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
@@ -126,10 +126,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try
     {
-      ACE_CString env ("SSL_CERT_FILE=");
-      env += cert_file;
-      ACE_OS::putenv (env.c_str ());
-
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv);
 
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client_nopasswd.conf b/TAO/orbsvcs/tests/Security/Secure_Invocation/client_nopasswd.conf
index c485fa19f3a..cf52d7cc4c4 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client_nopasswd.conf
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client_nopasswd.conf
@@ -1,4 +1,4 @@
 # $Id$
 
-dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate NONE -SSLPrivateKey PEM:client_key_nopasswd.pem -SSLCertificate PEM:client_cert.pem"
+dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate NONE -SSLPrivateKey PEM:client_key_nopasswd.pem -SSLCertificate PEM:client_cert.pem -SSLCAfile PEM:cacert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.conf b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.conf
index ee0ef1aa57c..c0a310504f5 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.conf
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.conf
@@ -1,4 +1,4 @@
 # $Id$
 
-dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"
+dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate SERVER_AND_CLIENT -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem -SSLCAfile PEM:cacert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
index d4fdcd0bc0f..723915cf2c1 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
@@ -42,10 +42,6 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
   try
     {
-      ACE_CString env ("SSL_CERT_FILE=");
-      env += cert_file;
-      ACE_OS::putenv (env.c_str ());
-
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc, argv);
 
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_none.conf b/TAO/orbsvcs/tests/Security/Secure_Invocation/server_none.conf
index e445c19615f..52c7340e359 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_none.conf
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server_none.conf
@@ -1,4 +1,4 @@
 # $Id$
 
-dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate NONE -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem"
+dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate NONE -SSLPrivateKey PEM:server_key.pem -SSLCertificate PEM:server_cert.pem -SSLCAfile PEM:cacert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_nopasswd.conf b/TAO/orbsvcs/tests/Security/Secure_Invocation/server_nopasswd.conf
index 19cd88ba742..01db313e9fb 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server_nopasswd.conf
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server_nopasswd.conf
@@ -1,4 +1,4 @@
 # $Id$
 
-dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate NONE -SSLPrivateKey PEM:server_key_nopasswd.pem -SSLCertificate PEM:server_cert.pem"
+dynamic SSLIOP_Factory Service_Object * TAO_SSLIOP:_make_TAO_SSLIOP_Protocol_Factory() "-SSLAuthenticate NONE -SSLPrivateKey PEM:server_key_nopasswd.pem -SSLCertificate PEM:server_cert.pem -SSLCAfile PEM:cacert.pem"
 static Resource_Factory "-ORBProtocolFactory SSLIOP_Factory"