ChangeLogTag: Fri Jul 1 17:44:31 UTC 2011 Jeff Parsons <j.parsons@vanderbilt.edu>

131 files changed, 2311 insertions, 983 deletions

diff --git a/ChangeLog b/ChangeLog
index 2f0c05d0050..7215a6b93bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,225 @@
+Fri Jul  1 17:44:31 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+  
+        * Merged the main trunk of TAO into this branch again.
+
+  Wed Jun 29 12:44:21 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+          * examples/Advanced/TO-DO:
+          * examples/Advanced/ch_21/client.cpp:
+          * examples/Quoter/Quoter_i.cpp:
+          * examples/Simple/bank/README:
+            Cleanup
+
+  Wed Jun 29 11:27:19 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+          * tests/OBV/Simple/Client_i.h:
+          * tests/OBV/Simple/OBV_impl.h:
+          * tests/OBV/Simple/Server_i.h:
+          * tests/OBV/Simple/Server_i.cpp:
+          * tests/OBV/Simple/server.cpp:
+            Cleanup
+
+  Wed Jun 29 11:13:02 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+          * tao/AnyTypeCode/TypeCode_Case_T.h:
+          * tao/Basic_Argument_T.h:
+          * tao/Invocation_Adapter.h:
+          * tao/Bounded_Basic_String_Sequence_T.h:
+          * tao/Generic_Sequence_T.h:
+            Layout changes
+
+          * tao/Object.cpp:
+            Fixed coverity errors
+
+          * tao/Incoming_Message_Stack.h:
+            Removed borland workaround
+
+  Wed Jun 29 10:47:05 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+          * tao/ORB_Core.cpp:
+            Fixed coverity errors
+
+  Mon Jun 27 10:28:15 UTC 2011  Martin Corino  <mcorino@remedy.nl>
+
+          * tao/CDR.h:
+          * tao/CDR.inl:
+            Added CDR streaming ops for std::wstring and helper classes
+            and streaming ops to extract bounded strings into std strings.
+
+  Thu Jun 23 12:39:08 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+          * etc/*.doxygen:
+            Disable html help, seems doxygen now disables the search option
+            when html help is enabled
+
+  Thu Jun 23 13:46:08 CEST 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+          * TAO version 2.0.3 released.
+
+  Wed Jun 22 18:25:21 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+          * tao/AnyTypeCode/Any_Basic_Impl.cpp:
+          * tao/AnyTypeCode/Any_Basic_Impl.h:
+          * tests/LongDouble/client.cpp:
+          * tests/IDL_Test/constants.idl:
+          * tests/IDL_Test/union.idl:
+          * TAO_IDL/include/ast_expression.h:
+          * TAO_IDL/be/be_helper.cpp:
+          * TAO_IDL/be/be_visitor_constant/constant_cs.cpp:
+          * TAO_IDL/be/be_visitor_constant/constant_ch.cpp:
+          * TAO_IDL/ast/ast_constant.cpp:
+          * TAO_IDL/ast/ast_expression.cpp:
+          * NEWS:
+
+            Reverted all changes related to support for long double
+            constants in IDL.
+
+  Wed Jun 22 15:15:05 UTC 2011  Phil Mesnier  <mesnier_p@ociweb.com>
+
+          * orbsvcs/orbsvcs/Naming/Naming_Server.cpp:
+
+            Ensure the naming service can use the CSD_TP strategy if necessary.
+            Since the naming service is single threaded, it can become a
+            bottleneck when there is very heavy use.
+
+            The need for this change may also indicate a problem with the
+            CSD strategy implementation. It appears that the thread pool at
+            least is only initialized when the POA Manager is activated. If
+            A POA is created with using a POA Manager already in the active
+            state, the TP is not initialized. Alternatively this might be a
+            problem with the POA creation, that create_POA can be supplied a
+            POA Manager that is already been activated, and the new POA is
+            itself instantly active.
+
+  Wed Jun 22 14:49:09 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+          * orbsvcs/tests/Security/BiDirectional/run_test.pl:
+          * orbsvcs/tests/Security/Big_Request/run_test.pl:
+          Added -clog and -slog to write a separate client and server log file
+          to disk
+
+  Tue Jun 21 13:07:15 UTC 2011  Olli Savia  <ops@iki.fi>
+
+          * TAO_IDL/util/utl_err.cpp:
+          Fixed typo.
+
+  Thu Jun 16 15:30:23 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+          * tests/IDL_Test/constants.idl:
+
+            Guarded out the long double constant set to the double max
+            value, for MinGW, which outputs a floating point error
+            for this value.
+
+  Thu Jun 16 14:00:53 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+          * tests/LongDouble/client.cpp:
+
+            Replaced '==' with equivalent '<' and '>' expressions for
+            a long double, some platoforms warn that '==' shouldn't
+            be used with floating point types.
+
+  Thu Jun 16 07:56:54 UTC 2011  Simon Massey  <sma at prismtech dot com>
+
+          * orbsvcs/tests/Security/Big_Request/cacert.pem:
+          * orbsvcs/tests/Security/Big_Request/client_cert.pem:
+          * orbsvcs/tests/Security/Big_Request/client_key.pem:
+          * orbsvcs/tests/Security/Big_Request/server_cert.pem:
+          * orbsvcs/tests/Security/Big_Request/server_key.pem:
+
+            Updated certificates - Missed one.
+
+  Wed Jun 15 14:36:54 UTC 2011  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+          * orbsvcs/tests/Security/Bug_1107_Regression/cacert.pem:
+          * orbsvcs/tests/Security/Bug_1107_Regression/client_cert.pem:
+          * orbsvcs/tests/Security/Bug_1107_Regression/client_key.pem:
+          * orbsvcs/tests/Security/Bug_1107_Regression/server_cert.pem:
+          * orbsvcs/tests/Security/Bug_1107_Regression/server_key.pem:
+          * orbsvcs/tests/Security/Callback/cacert.pem:
+          * orbsvcs/tests/Security/Callback/client_cert.pem:
+          * orbsvcs/tests/Security/Callback/client_key.pem:
+          * orbsvcs/tests/Security/Callback/server_cert.pem:
+          * orbsvcs/tests/Security/Callback/server_key.pem:
+          * orbsvcs/tests/Security/Crash_Test/cacert.pem:
+          * orbsvcs/tests/Security/Crash_Test/client_cert.pem:
+          * orbsvcs/tests/Security/Crash_Test/client_key.pem:
+          * orbsvcs/tests/Security/Crash_Test/server_cert.pem:
+          * orbsvcs/tests/Security/Crash_Test/server_key.pem:
+          * orbsvcs/tests/Security/Null_Cipher/cacert.pem:
+          * orbsvcs/tests/Security/Null_Cipher/client_cert.pem:
+          * orbsvcs/tests/Security/Null_Cipher/client_key.pem:
+          * orbsvcs/tests/Security/Null_Cipher/server_cert.pem:
+          * orbsvcs/tests/Security/Null_Cipher/server_key.pem:
+          * orbsvcs/tests/Security/Secure_Invocation/cacert.pem:
+          * orbsvcs/tests/Security/Secure_Invocation/client_cert.pem:
+          * orbsvcs/tests/Security/Secure_Invocation/client_key.pem:
+          * orbsvcs/tests/Security/Secure_Invocation/server_cert.pem:
+          * orbsvcs/tests/Security/Secure_Invocation/server_key.pem:
+          * orbsvcs/tests/Security/mixed_security_test/cacert.pem:
+          * orbsvcs/tests/Security/mixed_security_test/client_cert.pem:
+          * orbsvcs/tests/Security/mixed_security_test/client_key.pem:
+          * orbsvcs/tests/Security/mixed_security_test/server_cert.pem:
+          * orbsvcs/tests/Security/mixed_security_test/server_key.pem:
+
+            Updated certificates.
+
+          * orbsvcs/tests/Security/cert:
+          * orbsvcs/tests/Security/cert/DOCCA:
+          * orbsvcs/tests/Security/cert/DOCCA/cacert.pem:
+          * orbsvcs/tests/Security/cert/DOCCA/certs:
+          * orbsvcs/tests/Security/cert/DOCCA/index.txt:
+          * orbsvcs/tests/Security/cert/DOCCA/index.txt.attr:
+          * orbsvcs/tests/Security/cert/DOCCA/index.txt.attr.old:
+          * orbsvcs/tests/Security/cert/DOCCA/index.txt.old:
+          * orbsvcs/tests/Security/cert/DOCCA/newcerts:
+          * orbsvcs/tests/Security/cert/DOCCA/newcerts/1000.pem:
+          * orbsvcs/tests/Security/cert/DOCCA/newcerts/1001.pem:
+          * orbsvcs/tests/Security/cert/DOCCA/private:
+          * orbsvcs/tests/Security/cert/DOCCA/private/cakey.pem:
+          * orbsvcs/tests/Security/cert/DOCCA/serial:
+          * orbsvcs/tests/Security/cert/DOCCA/serial.old:
+          * orbsvcs/tests/Security/cert/README:
+          * orbsvcs/tests/Security/cert/cacert.pem:
+          * orbsvcs/tests/Security/cert/client_cert.pem:
+          * orbsvcs/tests/Security/cert/client_key.pem:
+          * orbsvcs/tests/Security/cert/openssl.cnf:
+          * orbsvcs/tests/Security/cert/server_cert.pem:
+          * orbsvcs/tests/Security/cert/server_key.pem:
+
+            Added the full CA information used to sign the above certs.  These certs
+            are good for the next 20 years.
+
+          * orbsvcs/tests/Security/Secure_Invocation/client_key_nopasswd.pem:
+          * orbsvcs/tests/Security/Secure_Invocation/server_key_nopasswd.pem:
+          * orbsvcs/tests/Security/mixed_security_test/client_key_nopasswd.pem:
+          * orbsvcs/tests/Security/mixed_security_test/server_key_nopasswd.pem:
+
+            Removed these files.
+
+  Wed Jun 15 08:54:50 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+          * TAO_IDL/be/be_visitor_operation/operation_ch.cpp:
+            Reverted 3971 change, broke some CCM tests
+
+  Tue Jun 14 13:12:05 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+          * TAO_IDL/be/be_valuetype.cpp:
+          * TAO_IDL/be/be_valuetype.h:
+          * TAO_IDL/be/be_visitor_amh_pre_proc.cpp:
+          * TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp:
+
+            Added code generation for AMH exception holder's default
+            constructor to initialize the CORBA::Exception* member
+            to 0. This fix closes [BUGID:3970].
+
+  Tue Jun 14 12:18:00 UTC 2011  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+          * TAO_IDL/be/be_visitor_operation/operation_ch.cpp:
+            Only the methods for operations in local interfaces need to be
+            virtual. This reduces footprint and improves performance, this
+            fixes bugzilla 3971
+
 Mon Jun 13 18:00:05 UTC 2011  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * Merged main trunk into this branch, resolved all conflicts.
diff --git a/NEWS b/NEWS
index 18bd130a44b..48b14594cf3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,11 @@
-USER VISIBLE CHANGES BETWEEN TAO-2.0.2 and TAO-2.0.3
+USER VISIBLE CHANGES BETWEEN TAO-2.0.3 and TAO-2.0.4
 ====================================================
 
-. Added support for long double constants in IDL
+USER VISIBLE CHANGES BETWEEN TAO-2.0.2 and TAO-2.0.3
+====================================================
 
-. Improved support for mt_noupcall but this is still experimental
+. Improved support for mt_noupcall but this is still not optimal due to a 2ms
+  wait delay
 
 . Addressed several Coverity reported issues
 
diff --git a/PROBLEM-REPORT-FORM b/PROBLEM-REPORT-FORM
index 8f1d1e31f18..14fa8b51ec1 100644
--- a/PROBLEM-REPORT-FORM
+++ b/PROBLEM-REPORT-FORM
@@ -40,8 +40,8 @@
 To: tao-bugs@list.isis.vanderbilt.edu
 Subject: [area]: [synopsis]
 
-    TAO VERSION: 2.0.2
-    ACE VERSION: 6.0.2
+    TAO VERSION: 2.0.3
+    ACE VERSION: 6.0.3
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
diff --git a/TAO_IDL/ast/ast_constant.cpp b/TAO_IDL/ast/ast_constant.cpp
index 47396064b39..950743caa32 100644
--- a/TAO_IDL/ast/ast_constant.cpp
+++ b/TAO_IDL/ast/ast_constant.cpp
@@ -254,8 +254,6 @@ AST_Constant::exprtype_to_string (void)
       return "CORBA::Float";
     case AST_Expression::EV_double:
       return "CORBA::Double";
-    case AST_Expression::EV_longdouble:
-      return "CORBA::LongDouble";
     case AST_Expression::EV_char:
       return "CORBA::Char";
     case AST_Expression::EV_octet:
@@ -277,6 +275,7 @@ AST_Constant::exprtype_to_string (void)
     case AST_Expression::EV_wstring:
       return "CORBA::WChar *const";
     case AST_Expression::EV_enum:
+    case AST_Expression::EV_longdouble:
     case AST_Expression::EV_any:
     case AST_Expression::EV_object:
       return 0;
diff --git a/TAO_IDL/ast/ast_expression.cpp b/TAO_IDL/ast/ast_expression.cpp
index 3c42c043a6d..2acb4256622 100644
--- a/TAO_IDL/ast/ast_expression.cpp
+++ b/TAO_IDL/ast/ast_expression.cpp
@@ -521,12 +521,6 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
       return 0;
     }
 
-#if defined (NONNATIVE_LONGDOUBLE)
-  typedef  ACE_CDR::LongDouble::NativeImpl LD_TYPE;
-#else
-  typedef ACE_CDR::LongDouble LD_TYPE;
-#endif // defined NONNATIVE_LONGDOUBLE
-
   switch (t)
     {
     case AST_Expression::EV_short:
@@ -631,15 +625,6 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           ev->et = AST_Expression::EV_short;
           return ev;
         case AST_Expression::EV_longdouble:
-          if (ev->u.ldval > (LD_TYPE) ACE_INT16_MAX
-              || ev->u.ldval < (LD_TYPE) ACE_INT16_MIN)
-            {
-              return 0;
-            }
-
-          ev->u.sval = (short) ev->u.ldval;
-          ev->et = AST_Expression::EV_short;
-          return ev;
         case AST_Expression::EV_string:
         case AST_Expression::EV_wstring:
         case AST_Expression::EV_enum:
@@ -751,14 +736,6 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           ev->et = AST_Expression::EV_ushort;
           return ev;
         case AST_Expression::EV_longdouble:
-          if (ev->u.ldval > (LD_TYPE) ACE_UINT16_MAX)
-            {
-              return 0;
-            }
-
-          ev->u.usval = (unsigned short) ev->u.ldval;
-          ev->et = AST_Expression::EV_ushort;
-          return ev;
         case AST_Expression::EV_wstring:
         case AST_Expression::EV_string:
         case AST_Expression::EV_enum:
@@ -853,15 +830,6 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           ev->et = AST_Expression::EV_long;
           return ev;
         case AST_Expression::EV_longdouble:
-          if (ev->u.ldval > (LD_TYPE) ACE_INT32_MAX
-              || ev->u.ldval < (LD_TYPE) ACE_INT32_MIN)
-            {
-              return 0;
-            }
-
-          ev->u.lval = (long) ev->u.ldval;
-          ev->et = AST_Expression::EV_long;
-          return ev;
         case AST_Expression::EV_wstring:
         case AST_Expression::EV_string:
         case AST_Expression::EV_enum:
@@ -966,14 +934,6 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           ev->et = AST_Expression::EV_ulong;
           return ev;
         case AST_Expression::EV_longdouble:
-          if (ev->u.ldval > (LD_TYPE) ACE_UINT32_MAX)
-            {
-              return 0;
-            }
-
-          ev->u.ulval = (unsigned long) ev->u.ldval;
-          ev->et = AST_Expression::EV_ulong;
-          return ev;
         case AST_Expression::EV_wstring:
         case AST_Expression::EV_string:
         case AST_Expression::EV_enum:
@@ -1008,7 +968,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_ulonglong:
           if (ev->u.ullval > ACE_INT64_MAX)
             {
-              return 0;
+                    return 0;
             }
 
           ev->u.llval =
@@ -1023,7 +983,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.fval > (float) ACE_INT64_MAX
               || ev->u.fval < (float) ACE_INT64_MIN)
             {
-              return 0;
+                    return 0;
             }
 
           ev->u.llval = (ACE_CDR::LongLong) ev->u.fval;
@@ -1033,7 +993,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.dval > (double) ACE_INT64_MAX
               || ev->u.dval < (double) ACE_INT64_MIN)
             {
-              return 0;
+                    return 0;
             }
 
           ev->u.llval = (ACE_CDR::LongLong) ev->u.dval;
@@ -1052,15 +1012,6 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           ev->et = AST_Expression::EV_longlong;
           return ev;
         case AST_Expression::EV_longdouble:
-          if (ev->u.ldval > (LD_TYPE) ACE_INT64_MAX
-              || ev->u.ldval < (LD_TYPE) ACE_INT64_MIN)
-            {
-              return 0;
-            }
-
-          ev->u.llval = (ACE_CDR::LongLong) ev->u.ldval;
-          ev->et = AST_Expression::EV_longlong;
-          return ev;
         case AST_Expression::EV_wstring:
         case AST_Expression::EV_string:
         case AST_Expression::EV_enum:
@@ -1179,14 +1130,6 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           ev->et = AST_Expression::EV_ulonglong;
           return ev;
         case AST_Expression::EV_longdouble:
-          if (ev->u.ldval > (LD_TYPE) ACE_UINT64_MAX)
-            {
-              return 0;
-            }
-
-          ev->u.ullval = (ACE_CDR::ULongLong) ev->u.ldval;
-          ev->et = AST_Expression::EV_ulonglong;
-          return ev;
         case AST_Expression::EV_wstring:
         case AST_Expression::EV_string:
         case AST_Expression::EV_enum:
@@ -1257,12 +1200,6 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           ev->et = AST_Expression::EV_bool;
           return ev;
         case AST_Expression::EV_longdouble:
-          {
-            ev->u.bval =
-              ACE::is_equal<LD_TYPE> (ev->u.ldval, 0.0) ? false : true;
-            ev->et = AST_Expression::EV_bool;
-            return ev;
-          }
         case AST_Expression::EV_wstring:
         case AST_Expression::EV_string:
         case AST_Expression::EV_enum:
@@ -1322,7 +1259,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.dval > ACE_FLT_MAX
               || ev->u.dval < -(ACE_FLT_MAX))
             {
-              return 0;
+                    return 0;
             }
 
           ev->u.fval = (float) ev->u.dval;
@@ -1341,15 +1278,6 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           ev->et = AST_Expression::EV_float;
           return ev;
         case AST_Expression::EV_longdouble:
-          if (ev->u.ldval > ACE_FLT_MAX
-              || ev->u.ldval < -(ACE_FLT_MAX))
-            {
-              return 0;
-            }
-
-          ev->u.fval = (float) ev->u.ldval;
-          ev->et = AST_Expression::EV_float;
-          return ev;
         case AST_Expression::EV_wstring:
         case AST_Expression::EV_string:
         case AST_Expression::EV_enum:
@@ -1424,15 +1352,6 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           ev->et = AST_Expression::EV_double;
           return ev;
         case AST_Expression::EV_longdouble:
-          if (ev->u.ldval > ACE_DBL_MAX
-              || ev->u.ldval < -(ACE_DBL_MAX))
-            {
-              return 0;
-            }
-
-          ev->u.dval = (double) ev->u.ldval;
-          ev->et = AST_Expression::EV_double;
-          return ev;
         case AST_Expression::EV_wstring:
         case AST_Expression::EV_string:
         case AST_Expression::EV_enum:
@@ -1518,7 +1437,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.fval > (float) ACE_CHAR_MAX
               || ev->u.fval < (float) ACE_CHAR_MIN)
             {
-              return 0;
+                    return 0;
             }
 
           ev->u.cval = (char) ev->u.fval;
@@ -1528,7 +1447,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.dval > (double) ACE_CHAR_MAX
               || ev->u.dval < (double) ACE_CHAR_MIN)
             {
-              return 0;
+                    return 0;
             }
 
           ev->u.cval = (char) ev->u.dval;
@@ -1548,22 +1467,13 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_octet:
           if (ev->u.oval > (unsigned char) ACE_CHAR_MAX)
             {
-              return 0;
+                    return 0;
             }
 
           ev->u.cval = (char) ev->u.oval;
           ev->et = AST_Expression::EV_char;
           return ev;
         case AST_Expression::EV_longdouble:
-          if (ev->u.ldval > (double) ACE_CHAR_MAX
-              || ev->u.ldval < (double) ACE_CHAR_MIN)
-            {
-              return 0;
-            }
-
-          ev->u.cval = (char) ev->u.ldval;
-          ev->et = AST_Expression::EV_char;
-          return ev;
         case AST_Expression::EV_wstring:
         case AST_Expression::EV_string:
         case AST_Expression::EV_enum:
@@ -1643,7 +1553,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.fval > (float) ACE_WCHAR_MAX
               || ev->u.fval < 0)
             {
-              return 0;
+                    return 0;
             }
 
           ev->u.wcval = (ACE_CDR::WChar) ev->u.fval;
@@ -1653,7 +1563,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.dval > (double) ACE_WCHAR_MAX
               || ev->u.dval < 0)
             {
-              return 0;
+                    return 0;
             }
 
           ev->u.wcval = (ACE_CDR::WChar) ev->u.dval;
@@ -1675,15 +1585,6 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           ev->et = AST_Expression::EV_wchar;
           return ev;
         case AST_Expression::EV_longdouble:
-          if (ev->u.ldval > (double) ACE_WCHAR_MAX
-              || ev->u.ldval < 0)
-            {
-              return 0;
-            }
-
-          ev->u.wcval = (ACE_CDR::WChar) ev->u.ldval;
-          ev->et = AST_Expression::EV_wchar;
-          return ev;
         case AST_Expression::EV_wstring:
         case AST_Expression::EV_string:
         case AST_Expression::EV_enum:
@@ -1769,7 +1670,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.fval < 0.0
               || ev->u.fval > (float) ACE_OCTET_MAX)
             {
-              return 0;
+                    return 0;
             }
 
           ev->u.oval = (unsigned char) ev->u.fval;
@@ -1779,7 +1680,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           if (ev->u.dval < 0.0
               || ev->u.dval > (double) ACE_OCTET_MAX)
             {
-              return 0;
+                    return 0;
             }
 
           ev->u.oval = (unsigned char) ev->u.dval;
@@ -1806,17 +1707,6 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
         case AST_Expression::EV_octet:
           return ev;
         case AST_Expression::EV_longdouble:
-          {
-            if (ev->u.ldval < 0.0
-                || ev->u.ldval > (LD_TYPE) ACE_OCTET_MAX)
-              {
-                return 0;
-              }
-
-            ev->u.oval = (unsigned char) ev->u.ldval;
-            ev->et = AST_Expression::EV_octet;
-            return ev;
-          }
         case AST_Expression::EV_wstring:
         case AST_Expression::EV_string:
         case AST_Expression::EV_enum:
@@ -1854,77 +1744,6 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
           return 0;
         }
     case AST_Expression::EV_longdouble:
-      switch (ev->et)
-        {
-        case AST_Expression::EV_short:
-          ev->u.ldval = (LD_TYPE) ev->u.sval;
-          ev->et = AST_Expression::EV_longdouble;
-          return ev;
-        case AST_Expression::EV_ushort:
-          ev->u.ldval = (LD_TYPE) ev->u.usval;
-          ev->et = AST_Expression::EV_longdouble;
-          return ev;
-        case AST_Expression::EV_long:
-          ev->u.ldval = (LD_TYPE) ev->u.lval;
-          ev->et = AST_Expression::EV_longdouble;
-          return ev;
-        case AST_Expression::EV_ulong:
-          ev->u.ldval = (LD_TYPE) ev->u.ulval;
-          ev->et = AST_Expression::EV_double;
-          return ev;
-        case AST_Expression::EV_longlong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-          ev->u.ldval = (LD_TYPE) ev->u.llval;
-          ev->et = AST_Expression::EV_longdouble;
-          return ev;
-#else /* ! defined (ACE_LACKS_LONGLONG_T) */
-          return 0;
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
-        case AST_Expression::EV_ulonglong:
-#if ! defined (ACE_LACKS_LONGLONG_T)
-          ev->u.ldval = (LD_TYPE) ((ACE_CDR::LongLong) ev->u.ullval);
-          ev->et = AST_Expression::EV_longdouble;
-          return ev;
-#else /* ! defined (ACE_LACKS_LONGLONG_T) */
-          return 0;
-#endif /* ! defined (ACE_LACKS_LONGLONG_T) */
-        case AST_Expression::EV_bool:
-          {
-            ev->u.ldval = (ev->u.bval == true) ? 1.0 : 0.0;
-            ev->et = AST_Expression::EV_longdouble;
-            return ev;
-          }
-        case AST_Expression::EV_float:
-          ev->u.ldval = (LD_TYPE) ev->u.fval;
-          ev->et = AST_Expression::EV_longdouble;
-          return ev;
-        case AST_Expression::EV_double:
-          ev->u.ldval =(LD_TYPE) ev->u.dval;
-          ev->et = AST_Expression::EV_longdouble;
-          return ev;
-        case AST_Expression::EV_char:
-          ev->u.ldval = (LD_TYPE) ev->u.cval;
-          ev->et = AST_Expression::EV_longdouble;
-          return ev;
-        case AST_Expression::EV_wchar:
-          ev->u.ldval = (LD_TYPE) ev->u.wcval;
-          ev->et = AST_Expression::EV_longdouble;
-          return ev;
-        case AST_Expression::EV_octet:
-          ev->u.ldval = (LD_TYPE) ev->u.oval;
-          ev->et = AST_Expression::EV_longdouble;
-          return ev;
-        case AST_Expression::EV_longdouble:
-          return ev;
-        case AST_Expression::EV_wstring:
-        case AST_Expression::EV_string:
-        case AST_Expression::EV_enum:
-        case AST_Expression::EV_void:
-        case AST_Expression::EV_none:
-        case AST_Expression::EV_any:
-        case AST_Expression::EV_object:
-          return 0;
-        }
     case AST_Expression::EV_wstring:
     case AST_Expression::EV_any:
     case AST_Expression::EV_object:
@@ -2048,15 +1867,6 @@ eval_kind (AST_Expression::AST_ExprValue *ev, AST_Expression::EvalKind ek)
     case AST_Expression::EK_bool:
       retval = coerce_value (newval, AST_Expression::EV_bool);
       break;
-    case AST_Expression::EK_float:
-      retval = coerce_value (newval, AST_Expression::EV_float);
-      break;
-    case AST_Expression::EK_double:
-      retval = coerce_value (newval, AST_Expression::EV_double);
-      break;
-    case AST_Expression::EK_longdouble:
-      retval = coerce_value (newval, AST_Expression::EV_longdouble);
-      break;
     default:
       break;
   }
@@ -2898,15 +2708,6 @@ AST_Expression::coerce (AST_Expression::ExprType t)
     case EV_bool:
       tmp = this->eval_internal (EK_bool);
       break;
-    case EV_float:
-      tmp = this->eval_internal (EK_float);
-      break;
-    case EV_double:
-      tmp = this->eval_internal (EK_double);
-      break;
-    case EV_longdouble:
-      tmp = this->eval_internal (EK_longdouble);
-      break;
     default:
       tmp = this->eval_internal (EK_const);
       break;
@@ -2932,6 +2733,7 @@ AST_Expression::coerce (AST_Expression::ExprType t)
 
   switch (this->pd_ev->et)
   {
+    case EV_longdouble:
     case EV_void:
     case EV_none:
       delete copy;
@@ -2976,9 +2778,6 @@ AST_Expression::coerce (AST_Expression::ExprType t)
     case EV_double:
       copy->u.dval = this->pd_ev->u.dval;
       break;
-    case EV_longdouble:
-      copy->u.ldval = this->pd_ev->u.ldval;
-      break;
     case EV_char:
       copy->u.cval = this->pd_ev->u.cval;
       break;
diff --git a/TAO_IDL/be/be_helper.cpp b/TAO_IDL/be/be_helper.cpp
index 11cf872b902..19fe55a813d 100644
--- a/TAO_IDL/be/be_helper.cpp
+++ b/TAO_IDL/be/be_helper.cpp
@@ -553,9 +553,6 @@ TAO_OutStream::print (AST_Expression *expr)
     case AST_Expression::EV_double:
       this->TAO_OutStream::print ("%#24.16G", ev->u.dval);
       break;
-    case AST_Expression::EV_longdouble:
-      this->TAO_OutStream::print ("%#24.16LGL", ev->u.ldval);
-      break;
     case AST_Expression::EV_char:
       // isprint() sees \ and ' as printable characters
       // so we have to test for them first.
diff --git a/TAO_IDL/be/be_valuetype.cpp b/TAO_IDL/be/be_valuetype.cpp
index d1e3e0abddb..b065f3006f8 100644
--- a/TAO_IDL/be/be_valuetype.cpp
+++ b/TAO_IDL/be/be_valuetype.cpp
@@ -80,7 +80,8 @@ be_valuetype::be_valuetype (UTL_ScopedName *n,
                    custom),
     supports_abstract_ (false),
     var_out_seq_decls_gen_ (false),
-    full_obv_skel_name_ (0)
+    full_obv_skel_name_ (0),
+    is_amh_excep_holder_ (false)
 {
   // Check that redefine() copies all members.
 
@@ -427,6 +428,18 @@ be_valuetype::has_member (void)
   return false;
 }
 
+bool
+be_valuetype::is_amh_excep_holder (void) const
+{
+  return this->is_amh_excep_holder_;
+}
+
+void
+be_valuetype::is_amh_excep_holder (bool val)
+{
+  this->is_amh_excep_holder_ = val;
+}
+
 int
 be_valuetype::gen_helper_header (char *, char *)
 {
diff --git a/TAO_IDL/be/be_visitor_amh_pre_proc.cpp b/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
index 6d42245906c..13d35b9613b 100644
--- a/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
+++ b/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
@@ -105,6 +105,7 @@ be_visitor_amh_pre_proc::visit_interface (be_interface *node)
     this->create_exception_holder (node);
   excep_holder->set_defined_in (node->defined_in ());
   excep_holder->original_interface (node);
+  excep_holder->is_amh_excep_holder (true);
 
   AST_Module *module =
     AST_Module::narrow_from_scope (node->defined_in ());
diff --git a/TAO_IDL/be/be_visitor_constant/constant_ch.cpp b/TAO_IDL/be/be_visitor_constant/constant_ch.cpp
index 0e7ae60c80b..53e073435ff 100644
--- a/TAO_IDL/be/be_visitor_constant/constant_ch.cpp
+++ b/TAO_IDL/be/be_visitor_constant/constant_ch.cpp
@@ -126,16 +126,7 @@ be_visitor_constant_ch::visit_constant (be_constant *node)
   if (!node->is_nested ()
       || (be_global->gen_inline_constants () && !forbidden_in_class))
     {
-      if (etype == AST_Expression::EV_longdouble)
-        {
-          *os << " (" << be_idt_nl
-              << "ACE_CDR::LongDoubleAssign ("
-              << node->constant_value () << "))" << be_uidt;
-        }
-      else
-        {
-          *os << " = " << node->constant_value ();
-        }
+      *os << " = " << node->constant_value ();
     }
 
   *os << ";";
diff --git a/TAO_IDL/be/be_visitor_constant/constant_cs.cpp b/TAO_IDL/be/be_visitor_constant/constant_cs.cpp
index 6d4ceca7677..991b18b2384 100644
--- a/TAO_IDL/be/be_visitor_constant/constant_cs.cpp
+++ b/TAO_IDL/be/be_visitor_constant/constant_cs.cpp
@@ -80,23 +80,12 @@ be_visitor_constant_cs::visit_constant (be_constant *node)
     }
 
   *os << " " << node->name ();
-
   if (!be_global->gen_inline_constants () || forbidden_in_class)
     {
       // For those constants not defined in the outermost scope,
       // or in a module, they get assigned to their values in the source file.
-      if (etype == AST_Expression::EV_longdouble)
-        {
-          *os << " (" << be_idt_nl
-              << "ACE_CDR::LongDoubleAssign ("
-              << node->constant_value () << "))" << be_uidt;
-        }
-      else
-        {
-          *os << " = " << node->constant_value ();
-        }
+      *os << " = " << node->constant_value ();
     }
-
   *os << ";";
 
   if (be_global->gen_inline_constants () && !forbidden_in_class)
diff --git a/TAO_IDL/be/be_visitor_operation/operation_ch.cpp b/TAO_IDL/be/be_visitor_operation/operation_ch.cpp
index e2ead068506..769362a8d7f 100644
--- a/TAO_IDL/be/be_visitor_operation/operation_ch.cpp
+++ b/TAO_IDL/be/be_visitor_operation/operation_ch.cpp
@@ -32,9 +32,13 @@ be_visitor_operation_ch::visit_operation (be_operation *node)
 
   this->ctx_->node (node);
 
-  // Every operation is declared virtual in the client code.
-  *os << be_nl_2
-      << "virtual ";
+  *os << be_nl_2;
+
+  // Only local operations are generated virtual
+//  if (node->is_local ())
+  //  {
+      *os << "virtual ";
+//    }
 
   // STEP I: generate the return type.
   be_type *bt = be_type::narrow_from_decl (node->return_type ());
@@ -84,7 +88,7 @@ be_visitor_operation_ch::visit_operation (be_operation *node)
   be_interface *intf =
     be_interface::narrow_from_scope (node->defined_in ());
 
-  /// If we are in a reply handler, are not an execp_* operation,
+  /// If we are in a reply handler, are not an excep_* operation,
   /// and have no native args, then generate the AMI static
   /// reply stub declaration.
   if (intf != 0
diff --git a/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp b/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp
index 8dc3923c7bd..e8a581f08a5 100644
--- a/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp
+++ b/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp
@@ -48,6 +48,11 @@ be_visitor_valuetype_ci::visit_valuetype (be_valuetype *node)
   *os << "ACE_INLINE" << be_nl;
   *os << node->name () << "::" << node->local_name () << " (void)" << be_nl;
 
+  if (node->is_amh_excep_holder ())
+    {
+      *os << "  : exception (0)" << be_nl;
+    }
+
   if (node->truncatable())
     {
       *os << "{" << be_idt_nl
@@ -55,7 +60,9 @@ be_visitor_valuetype_ci::visit_valuetype (be_valuetype *node)
           << "}" << be_nl_2;
     }
   else
-    *os << "{}" << be_nl_2;
+    {
+      *os << "{}" << be_nl_2;
+    }
 
 
   *os << "ACE_INLINE const char* " << be_nl
diff --git a/TAO_IDL/be_include/be_valuetype.h b/TAO_IDL/be_include/be_valuetype.h
index b060aa3d62e..c92b4952dcd 100644
--- a/TAO_IDL/be_include/be_valuetype.h
+++ b/TAO_IDL/be_include/be_valuetype.h
@@ -172,6 +172,10 @@ public:
   /// Decides whether to generate the initializing contstructor or not.
   bool has_member (void);
 
+  /// Accessors for the member
+  bool is_amh_excep_holder (void) const;
+  void is_amh_excep_holder (bool val);
+
 private:
   /// Do we support at least one abstract interface?
   bool supports_abstract_;
@@ -181,6 +185,9 @@ private:
 
   /// To differentiate from the interface skeleton name.
   char *full_obv_skel_name_;
+
+  /// Flag used by default constructor generator.
+  bool is_amh_excep_holder_;
 };
 
 #endif  // if !defined
diff --git a/TAO_IDL/include/ast_expression.h b/TAO_IDL/include/ast_expression.h
index 468203c94da..faf9e6c72a8 100644
--- a/TAO_IDL/include/ast_expression.h
+++ b/TAO_IDL/include/ast_expression.h
@@ -119,9 +119,7 @@ public:
       , EK_longlong
       , EK_ulonglong
       , EK_octet
-      , EK_float
-      , EK_double
-      , EK_longdouble
+      , EK_floating_point
     };
 
   // Enum to define expression type.
@@ -170,31 +168,26 @@ public:
           ACE_CDR::Long       lval;     // Contains long expression value.
           ACE_CDR::ULong      ulval;    // Contains unsigned long expr value.
           ACE_CDR::Boolean    bval;     // Contains boolean expression value.
-          ACE_CDR::LongLong   llval;    // Contains long long expr value.
+          ACE_CDR::LongLong   llval;   // Contains long long expr value.
 #if  defined (ACE_LACKS_UNSIGNEDLONGLONG_T) && ! defined (ACE_LACKS_LONGLONG_T)
-          ACE_CDR::LongLong   ullval;   // Contains unsigned long long expr value
+          ACE_CDR::LongLong   ullval; // Contains unsigned long long expr value
 #elif ! defined (ACE_LACKS_LONGLONG_T)
-          ACE_CDR::ULongLong  ullval;   // Contains unsigned long long expr value.
+          ACE_CDR::ULongLong  ullval;  // Contains unsigned long long expr value.
 #endif /* defined (ACE_LACKS_UNSIGNEDLONGLONG_T) && ! defined (ACE_LACKS_LONGLONG_T) */
           ACE_CDR::Float      fval;     // Contains 32-bit float expr value.
           ACE_CDR::Double     dval;     // Contains 64-bit float expr value.
           ACE_CDR::Char       cval;     // Contains char expression value.
-          ACE_CDR::WChar      wcval;    // Contains wchar expression value. 
+          ACE_CDR::WChar      wcval;    // Contains wchar expression value.
           ACE_CDR::Octet      oval;     // Contains octet expr value.
           UTL_String          *strval;  // Contains String * expr value.
           char                *wstrval; // Contains wide string expr value.
           ACE_CDR::ULong      eval;     // Contains enumeration value.
-#if defined (NONNATIVE_LONGDOUBLE)
-          ACE_CDR::LongDouble::NativeImpl ldval; // Contains long double value.
-#else
-          ACE_CDR::LongDouble ldval;    // Contains long double value.
-#endif // defined (NONNATIVE_LONGDOUBLE)
         } u;
 
       ExprType et;
     };
 
-  // Operations.
+ // Operations.
 
   // Constructor(s).
   AST_Expression (AST_Expression *v,
diff --git a/TAO_IDL/util/utl_err.cpp b/TAO_IDL/util/utl_err.cpp
index de08a4830eb..e7b2af2ff2e 100644
--- a/TAO_IDL/util/utl_err.cpp
+++ b/TAO_IDL/util/utl_err.cpp
@@ -185,7 +185,7 @@ error_string (UTL_Error::ErrorCode c)
     case UTL_Error::EIDL_ANONYMOUS_ERROR:
       return "Error: anonymous types are deprecated by OMG spec";
     case UTL_Error::EIDL_ANONYMOUS_WARNING:
-      return "Warning - anonymous tyes are deprecated by OMG spec";
+      return "Warning - anonymous types are deprecated by OMG spec";
     case UTL_Error::EIDL_ENUM_VAL_EXPECTED:
       return "enumerator expected: ";
     case UTL_Error::EIDL_ENUM_VAL_NOT_FOUND:
diff --git a/VERSION b/VERSION
index 3547629a5f4..5abfee1ad52 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
-This is TAO version 2.0.2, released Wed Apr 20 09:52:52 CEST 2011
+This is TAO version 2.0.3, released Thu Jun 23 13:46:08 CEST 2011
 
 If you have any problems with or questions about TAO, please send
 e-mail to the TAO mailing list (tao-bugs@list.isis.vanderbilt.edu),
diff --git a/etc/tao.doxygen b/etc/tao.doxygen
index d76d4730168..da1319128bc 100644
--- a/etc/tao.doxygen
+++ b/etc/tao.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/etc/tao_anytypecode.doxygen b/etc/tao_anytypecode.doxygen
index 0e5ab250a70..fd19f1be074 100644
--- a/etc/tao_anytypecode.doxygen
+++ b/etc/tao_anytypecode.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/etc/tao_av.doxygen b/etc/tao_av.doxygen
index 2c4ef8757a5..54da471d6ef 100644
--- a/etc/tao_av.doxygen
+++ b/etc/tao_av.doxygen
@@ -80,7 +80,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/etc/tao_compression.doxygen b/etc/tao_compression.doxygen
index deec0a17d30..aad1b9bea0c 100644
--- a/etc/tao_compression.doxygen
+++ b/etc/tao_compression.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/etc/tao_cosevent.doxygen b/etc/tao_cosevent.doxygen
index f8e63aa3aa6..397f26d6def 100644
--- a/etc/tao_cosevent.doxygen
+++ b/etc/tao_cosevent.doxygen
@@ -80,7 +80,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/etc/tao_cosnaming.doxygen b/etc/tao_cosnaming.doxygen
index b6eca6ff7ef..aeb2acd4468 100644
--- a/etc/tao_cosnaming.doxygen
+++ b/etc/tao_cosnaming.doxygen
@@ -78,7 +78,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/etc/tao_cosnotification.doxygen b/etc/tao_cosnotification.doxygen
index f43b3bcc951..6aeb31cc43a 100644
--- a/etc/tao_cosnotification.doxygen
+++ b/etc/tao_cosnotification.doxygen
@@ -85,7 +85,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/etc/tao_costime.doxygen b/etc/tao_costime.doxygen
index b94477dadea..9c7b9bcda40 100644
--- a/etc/tao_costime.doxygen
+++ b/etc/tao_costime.doxygen
@@ -78,7 +78,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/etc/tao_costrader.doxygen b/etc/tao_costrader.doxygen
index a7f565d9ea8..046b93f8be0 100644
--- a/etc/tao_costrader.doxygen
+++ b/etc/tao_costrader.doxygen
@@ -80,7 +80,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/etc/tao_dynamicany.doxygen b/etc/tao_dynamicany.doxygen
index 16d2bed576c..b9e3cc9d752 100644
--- a/etc/tao_dynamicany.doxygen
+++ b/etc/tao_dynamicany.doxygen
@@ -78,7 +78,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/etc/tao_dynamicinterface.doxygen b/etc/tao_dynamicinterface.doxygen
index 47141d66893..e661ed62653 100644
--- a/etc/tao_dynamicinterface.doxygen
+++ b/etc/tao_dynamicinterface.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/etc/tao_esf.doxygen b/etc/tao_esf.doxygen
index 946642ed299..a5a5f1e9f2c 100644
--- a/etc/tao_esf.doxygen
+++ b/etc/tao_esf.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/etc/tao_ifr.doxygen b/etc/tao_ifr.doxygen
index 4c5016191a7..5ba8541d669 100644
--- a/etc/tao_ifr.doxygen
+++ b/etc/tao_ifr.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/etc/tao_implrepo.doxygen b/etc/tao_implrepo.doxygen
index ebf1f644752..46bf3264f1c 100644
--- a/etc/tao_implrepo.doxygen
+++ b/etc/tao_implrepo.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/etc/tao_iormanip.doxygen b/etc/tao_iormanip.doxygen
index 035065a69da..f6c958beade 100644
--- a/etc/tao_iormanip.doxygen
+++ b/etc/tao_iormanip.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/etc/tao_iortable.doxygen b/etc/tao_iortable.doxygen
index 89c0d8e7e4a..c3c2a189538 100644
--- a/etc/tao_iortable.doxygen
+++ b/etc/tao_iortable.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/etc/tao_pi.doxygen b/etc/tao_pi.doxygen
index 4574c930d52..54bfcb536c4 100644
--- a/etc/tao_pi.doxygen
+++ b/etc/tao_pi.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/etc/tao_pi_server.doxygen b/etc/tao_pi_server.doxygen
index 7e423a29c28..40f8a38458d 100644
--- a/etc/tao_pi_server.doxygen
+++ b/etc/tao_pi_server.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/etc/tao_portablegroup.doxygen b/etc/tao_portablegroup.doxygen
index 87ff0db81f2..b46d02feb1c 100644
--- a/etc/tao_portablegroup.doxygen
+++ b/etc/tao_portablegroup.doxygen
@@ -80,7 +80,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/etc/tao_portableserver.doxygen b/etc/tao_portableserver.doxygen
index abe30e36444..7769955701e 100644
--- a/etc/tao_portableserver.doxygen
+++ b/etc/tao_portableserver.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/etc/tao_rtcorba.doxygen b/etc/tao_rtcorba.doxygen
index 4bd083c73b7..b6930997085 100644
--- a/etc/tao_rtcorba.doxygen
+++ b/etc/tao_rtcorba.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/etc/tao_rtevent.doxygen b/etc/tao_rtevent.doxygen
index d432e2ee3d0..5fa13a4fbac 100644
--- a/etc/tao_rtevent.doxygen
+++ b/etc/tao_rtevent.doxygen
@@ -86,7 +86,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/etc/tao_rtportableserver.doxygen b/etc/tao_rtportableserver.doxygen
index b740a3bed35..5a8ee076fce 100644
--- a/etc/tao_rtportableserver.doxygen
+++ b/etc/tao_rtportableserver.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/etc/tao_security.doxygen b/etc/tao_security.doxygen
index 64e1f3a9ce2..7af7f5f56d0 100644
--- a/etc/tao_security.doxygen
+++ b/etc/tao_security.doxygen
@@ -82,7 +82,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/etc/tao_smartproxies.doxygen b/etc/tao_smartproxies.doxygen
index 83894b34ad1..ed4d41592d7 100644
--- a/etc/tao_smartproxies.doxygen
+++ b/etc/tao_smartproxies.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/etc/tao_ssliop.doxygen b/etc/tao_ssliop.doxygen
index d0b761a7fbc..f8f2b7544ab 100644
--- a/etc/tao_ssliop.doxygen
+++ b/etc/tao_ssliop.doxygen
@@ -82,7 +82,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/etc/tao_strategies.doxygen b/etc/tao_strategies.doxygen
index 2ac0de9e15f..a29f396d8f3 100644
--- a/etc/tao_strategies.doxygen
+++ b/etc/tao_strategies.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/etc/tao_transportcurrent.doxygen b/etc/tao_transportcurrent.doxygen
index 470407c0d70..a656796374f 100644
--- a/etc/tao_transportcurrent.doxygen
+++ b/etc/tao_transportcurrent.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/etc/tao_ziop.doxygen b/etc/tao_ziop.doxygen
index f4c5dcbe874..7c7d2a80344 100644
--- a/etc/tao_ziop.doxygen
+++ b/etc/tao_ziop.doxygen
@@ -77,7 +77,7 @@ HTML_HEADER           =
 HTML_FOOTER           =
 HTML_STYLESHEET       =
 HTML_ALIGN_MEMBERS    = YES
-GENERATE_HTMLHELP     = YES
+GENERATE_HTMLHELP     = NO
 
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/examples/Advanced/TO-DO b/examples/Advanced/TO-DO
index 796b748509c..76d0b1fbc55 100644
--- a/examples/Advanced/TO-DO
+++ b/examples/Advanced/TO-DO
@@ -1,28 +1,26 @@
 $Id$
 ______________________________________________________________________________
 
-This is a 'To Do' list for the TAO versions of the Henning and Vinoski 
+This is a 'To Do' list for the TAO versions of the Henning and Vinoski
 examples ($TAO_ROOT/examples/Advanced).   It is an ongoing effort to get
-these examples working with TAO, 'out of the box' with as few changes as 
-possible.  If you'd like to help or have additional problems to report 
+these examples working with TAO, 'out of the box' with as few changes as
+possible.  If you'd like to help or have additional problems to report
 please coordinate with Mike Moran <mm4@cs.wustl.edu>.
 
-All changes which have been made over the original code distribution have 
-been documented in CHANGES files in each examples directory.  Please keep 
+All changes which have been made over the original code distribution have
+been documented in CHANGES files in each examples directory.  Please keep
 these files up-to-date.
 ______________________________________________________________________________
 
 - Chapter 19's example throws exceptions at runtime.
 
-- run_tests.pl in ch_3/, ch8_and_10/, ch_12/, and ch_21 do not work on Win32.  
-  These tests need to redirect stdout of the server to a file, and maintain a 
-  reference to the process so that the server can killed at the end of the 
+- run_tests.pl in ch_3/, ch8_and_10/, ch_12/, and ch_21 do not work on Win32.
+  These tests need to redirect stdout of the server to a file, and maintain a
+  reference to the process so that the server can killed at the end of the
   script.
 
-- Some examples need .dsw files
-
-- Instances of fstream.close() and related error detection have been 
-  commented-out in all examples 12 and higher.  This code needs to be 
+- Instances of fstream.close() and related error detection have been
+  commented-out in all examples 12 and higher.  This code needs to be
   reinstated.
 
 - Chapters 8 and above do not work with MS Visual Studio. possibly due to
@@ -30,7 +28,7 @@ ______________________________________________________________________________
 
 - We could use a better test for the multitheraded server in ch_21.
 
-- Do more testing on various platforms and compilers.  These so far only 
+- Do more testing on various platforms and compilers.  These so far only
   Solaris 7, Linux and Windows NT have been used.
 
 
diff --git a/examples/Advanced/ch_21/client.cpp b/examples/Advanced/ch_21/client.cpp
index cc9db916187..eda65f7c518 100644
--- a/examples/Advanced/ch_21/client.cpp
+++ b/examples/Advanced/ch_21/client.cpp
@@ -5,14 +5,13 @@
  *
  *  $Id$
  *
- *  @author Source code used in TAO has been modified and adapted from the codeprovided in the book
+ *  @author Source code used in TAO has been modified and adapted from the code provided in the book
  *  @author "Advanced CORBA Programming with C++" by MichiHenning and Steve Vinoski. Copyright 1999. Addison-Wesley
  *  @author Reading
  *  @author MA.Modified for TAO by Mike Moran <mm4@cs.wustl.edu>
  */
 //=============================================================================
 
-
 #include "CCSC.h"        // ORB-specific
 #include <ace/streams.h>
 
diff --git a/examples/Quoter/Quoter_i.cpp b/examples/Quoter/Quoter_i.cpp
index 60f0b808739..73597fd685b 100644
--- a/examples/Quoter/Quoter_i.cpp
+++ b/examples/Quoter/Quoter_i.cpp
@@ -126,8 +126,7 @@ Quoter_i::get_quote (char const *)
 
 CosLifeCycle::LifeCycleObject_ptr
 Quoter_i::copy (CosLifeCycle::FactoryFinder_ptr there,
-                const CosLifeCycle::Criteria &/*the_criteria*/
-                )
+                const CosLifeCycle::Criteria &/*the_criteria*/)
 {
   const char *exception_message = "Null message";
   CosLifeCycle::LifeCycleObject_ptr lifeCycleObject_ptr =
@@ -239,8 +238,7 @@ Quoter_i::copy (CosLifeCycle::FactoryFinder_ptr there,
 
 void
 Quoter_i::move (CosLifeCycle::FactoryFinder_ptr /* there */,
-                const CosLifeCycle::Criteria & /* the_criteria */
-                )
+                const CosLifeCycle::Criteria & /* the_criteria */)
 {
   ACE_ERROR ((LM_ERROR,
               "Quoter_i::move: The Quoter object is not movable!"));
diff --git a/examples/Simple/bank/README b/examples/Simple/bank/README
index 7fc2d09e31e..15620728260 100644
--- a/examples/Simple/bank/README
+++ b/examples/Simple/bank/README
@@ -107,8 +107,3 @@ The client executes the following tests :
    more than the current balance. The server throws an exception which is
    passed to the client and the client displays the reason for the
    exception.
-
-
-
-
-
diff --git a/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
index 236e97accb8..1a021f655ff 100644
--- a/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
+++ b/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
@@ -324,13 +324,11 @@ TAO_Naming_Server::init_with_orb (int argc,
       PortableServer::POAManager_var poa_manager =
         this->root_poa_->the_POAManager ();
 
-      poa_manager->activate ();
-
 #if defined (CORBA_E_MICRO)
       this->ns_poa_ = PortableServer::POA::_duplicate (this->root_poa_);
 #else
       int numPolicies = 2;
-#if (TAO_HAS_MINIMUM_POA == 0)
+# if (TAO_HAS_MINIMUM_POA == 0)
       if (this->use_storable_context_)
         {
           this->use_servant_activator_ = true;
@@ -339,7 +337,7 @@ TAO_Naming_Server::init_with_orb (int argc,
       if (this->use_servant_activator_) {
         numPolicies += 2;
       }
-#endif /* TAO_HAS_MINIMUM_POA */
+# endif /* TAO_HAS_MINIMUM_POA */
 
       CORBA::PolicyList policies (numPolicies);
       policies.length (numPolicies);
@@ -352,7 +350,7 @@ TAO_Naming_Server::init_with_orb (int argc,
       policies[1] =
         this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT);
 
-#if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT)
+# if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT)
       if (this->use_servant_activator_)
         {
           // Request Processing Policy
@@ -363,7 +361,7 @@ TAO_Naming_Server::init_with_orb (int argc,
           policies[3] =
             this->root_poa_->create_servant_retention_policy (PortableServer::RETAIN);
         }
-#endif /* TAO_HAS_MINIMUM_POA */
+# endif /* TAO_HAS_MINIMUM_POA */
 
       // We use a different POA, otherwise the user would have to change
       // the object key each time it invokes the server.
@@ -383,6 +381,8 @@ TAO_Naming_Server::init_with_orb (int argc,
         }
 #endif /* CORBA_E_MICRO */
 
+      poa_manager->activate ();
+
 #if defined (CORBA_E_MICRO)
       result = this->init (orb,
                            this->ns_poa_.in (),
diff --git a/orbsvcs/tests/Security/BiDirectional/run_test.pl b/orbsvcs/tests/Security/BiDirectional/run_test.pl
index 4cba833ddf5..f74a43b8f30 100755
--- a/orbsvcs/tests/Security/BiDirectional/run_test.pl
+++ b/orbsvcs/tests/Security/BiDirectional/run_test.pl
@@ -16,15 +16,18 @@ $opt = "";
 $conf_client = "";
 $conf_server = "";
 $iter = 10;
+$svc_conf = $PerlACE::svcconf_ext;
 
 sub options () {
-    my $help = 0;       # handled locally
-    my $man = 0;        # handled locally
-    my $ssl = 1;        # handled locally
-    my $dotdec = 0;     # handled locally
+    my $help = 0;     # handled locally
+    my $man = 0;      # handled locally
+    my $ssl = 1;      # handled locally
+    my $dotdec = 0;   # handled locally
     my $debug;        # handled locally
     my $shost;        # handled locally
     my $chost;        # handled locally
+    my $clog;         # handled locally
+    my $slog;         # handled locally
 
     # Process options.
     if ( @ARGV > 0 ) {
@@ -35,12 +38,14 @@ sub options () {
                 'dd=s' => \$dotdec,
                 'shost=s' => \$shost,
                 'chost=s' => \$chost,
+                'slog=s' => \$slog,
+                'clog=s' => \$clog,
                 'debug=i' => \$debug) or pod2usage(2);
     }
 
     if ($ssl) {
-        $conf_client = " -ORBSvcConf client.conf";
-        $conf_server = " -ORBSvcConf server.conf";
+        $conf_client = " -ORBSvcConf client$svc_conf";
+        $conf_server = " -ORBSvcConf server$svc_conf";
     }
 
     if ($debug) {
@@ -56,6 +61,14 @@ sub options () {
         }
     }
 
+    if ($slog) {
+        $conf_server = "$conf_server -ORBLogFile $slog";
+    }
+
+    if ($clog) {
+        $conf_client = "$conf_client -ORBLogFile $clog";
+    }
+
     if ($shost) {
         $conf_server = "$conf_server -ORBListenEndpoints iiop:///hostname_in_ior=$shost";
     }
@@ -158,7 +171,8 @@ run_test.pl - A driver to run the test
 
 B<run_test.pl> [B<-help|?>] [B<-iter iterations>] [B<-chost host>]
                [B<-dd who>] [B<-shost host>] [B<-man>] [B<-ssl>]
-               [B<-debug level>]
+               [B<-debug level>] [B<-clog client logfile>]
+               [B<-slog server logfile>]
 
 
 =head1 DESCRIPTION
@@ -180,7 +194,7 @@ callback. The server then callsback the client on the same connection
 <no_iterations> times. If the server creates a new connection the server
 would crash itself.
 
-Basicaly, the test is a copy of the $TAO_ROOT/tests/BiDirectional with
+Basically, the test is a copy of the $TAO_ROOT/tests/BiDirectional with
 added support for SSLIOP.
 
 =head1 OPTIONS
@@ -191,6 +205,12 @@ added support for SSLIOP.
 [B<-iter iterations>]
     The number of iterations to make. Default is 10.
 
+[B<-clog logfile>]
+    The logfile for the client. Used only if specified.
+
+[B<-slog logfile>]
+    The logfile for the server. Used only if specified
+
 [B<-chost hostname>]
     The hostname_in_ior for the client. Used only if specified.
 
diff --git a/orbsvcs/tests/Security/Big_Request/cacert.pem b/orbsvcs/tests/Security/Big_Request/cacert.pem
index a9e905f4e6c..d98dd5918cb 100644
--- a/orbsvcs/tests/Security/Big_Request/cacert.pem
+++ b/orbsvcs/tests/Security/Big_Request/cacert.pem
@@ -1,21 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIIDfTCCAuagAwIBAgIBADANBgkqhkiG9w0BAQQFADCBjDELMAkGA1UEBhMCVVMx
-CzAJBgNVBAgTAkNBMQ8wDQYDVQQHEwZJcnZpbmUxEjAQBgNVBAoTCURPQyBHcm91
-cDEQMA4GA1UECxYHVUNJX0RPQzERMA8GA1UEAxMIUHJpeWFua2ExJjAkBgkqhkiG
-9w0BCQEWF3Bnb250bGFAZG9jLmVjZS51Y2kuZWR1MB4XDTAxMDYxMTE3MjI0MVoX
-DTExMDYwOTE3MjI0MVowgYwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEPMA0G
-A1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAOBgNVBAsWB1VDSV9E
-T0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkBFhdwZ29udGxhQGRv
-Yy5lY2UudWNpLmVkdTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyFiCRDUH
-nGJqQG9jT/2PhZUAgfwXvIwfDM8m/WujCt/buDcrOz767shBsk4HZhW91Vm4mE03
-K1zfCzojRigf28uyB/rlp60p2Fq0wvZBNNU5Muia6esleR4unb4QslOpcFhct/9n
-UPnlnnsZOTaGWaELNKEjYfHqPh8PQ0lYurECAwEAAaOB7DCB6TAdBgNVHQ4EFgQU
-0Y6IZjkLbLbtZ5aoKLcfd7Yc/kYwgbkGA1UdIwSBsTCBroAU0Y6IZjkLbLbtZ5ao
-KLcfd7Yc/kahgZKkgY8wgYwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEPMA0G
-A1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAOBgNVBAsWB1VDSV9E
-T0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkBFhdwZ29udGxhQGRv
-Yy5lY2UudWNpLmVkdYIBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4GB
-AHYi8ulIzUI3p3+Ma16rumZxvKcmkJJbU6fpAv4ZvK6AWyy+6Ja0GD5N3SGEx+xU
-nMffTR+LePa9PAZiR7dNkF6ikPxXZu4jn8KY2zFT3SB/VjCoEetR9i9QI//O0Fea
-3yZ0NygNWe5cyVDLCb4meucJpsClfyL28DWzMwD2liX3
+MIICgDCCAemgAwIBAgIJAO8E230uBaq+MA0GCSqGSIb3DQEBBQUAMDUxCzAJBgNV
+BAYTAlVTMRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDAe
+Fw0xMTA2MTUxMzU2MDRaFw0yMTA2MTIxMzU2MDRaMDUxCzAJBgNVBAYTAlVTMRIw
+EAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAxzlgJm5rZMTZEQCa7m3/JPbykh4FT7DwcrWBgDRF
+Jk0wgi4K7AKOFdCfOMqbW1Ps5ITbzgwq2yNXOrocKYs//02ewppKx5bxOE5wTA9v
+qwvaoJUeQ8PVEY+RVi2z+CP1xFIVKOCJtrg5WwWE9Vwvu3iyTe95dR1T95Hkrl0I
+yHECAwEAAaOBlzCBlDAdBgNVHQ4EFgQU/XO+9DMzOBifuZxp1BL+gTGVAwowZQYD
+VR0jBF4wXIAU/XO+9DMzOBifuZxp1BL+gTGVAwqhOaQ3MDUxCzAJBgNVBAYTAlVT
+MRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cIIJAO8E230u
+Baq+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAUxxR/7U35mIGJ7c/
+KfZZYze4/Aio7mf9QG0DA55F9DlB16IOJuRXqeMY2Lo+WFo7pszDX8TbucWtWJC6
+pMIVamWLTpgfVrWeTcafio/puqTALKfZ5LHzHieu1QNvFPQxMx1DZ5Eawowhl7ua
+4ERB9b/3K4StZjMUkPmBolSIkPo=
 -----END CERTIFICATE-----
diff --git a/orbsvcs/tests/Security/Big_Request/client_cert.pem b/orbsvcs/tests/Security/Big_Request/client_cert.pem
index 0bebb696cfc..b86bd5de1d2 100644
--- a/orbsvcs/tests/Security/Big_Request/client_cert.pem
+++ b/orbsvcs/tests/Security/Big_Request/client_cert.pem
@@ -1,16 +1,59 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 4097 (0x1001)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Tennessee, O=DOC Group
+        Validity
+            Not Before: Jun 15 14:01:34 2011 GMT
+            Not After : May 25 14:01:34 2032 GMT
+        Subject: C=US, ST=Tennessee, O=DOC Group, CN=Build Czar Client
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:cf:7f:8e:42:bf:bb:c0:a6:23:7e:07:a4:13:ba:
+                    b6:ba:cd:4c:ed:c4:9c:97:46:32:dc:d5:e9:63:59:
+                    59:b8:7c:0d:7a:97:ad:3f:29:dd:fc:40:4e:48:cc:
+                    b2:1b:15:c4:98:59:a8:b0:b0:38:23:d2:d8:81:22:
+                    27:1b:77:64:d6:40:c0:02:41:b6:db:a8:25:4d:c6:
+                    a1:f5:03:f6:fa:8a:d3:1c:b5:a4:a9:4c:a5:62:19:
+                    89:e3:dc:d8:ac:68:47:96:0f:3c:10:1a:ec:00:81:
+                    10:aa:13:3d:99:48:3a:ae:2b:ac:b9:de:5b:20:7c:
+                    06:4e:57:64:af:2d:b3:88:ef
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                6F:13:BA:8B:91:ED:FA:22:DC:28:26:D4:74:5C:46:A7:B2:B2:A9:10
+            X509v3 Authority Key Identifier: 
+                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
+
+    Signature Algorithm: sha1WithRSAEncryption
+        bc:6f:d5:c7:68:a0:3c:8d:3a:39:61:ff:50:80:c7:a3:b9:28:
+        aa:c8:7b:7e:2d:af:26:e1:0a:39:94:9d:a8:94:c8:cd:82:f5:
+        a5:fc:d1:df:3d:3f:55:c7:5b:f9:89:14:78:59:d6:64:2d:32:
+        42:23:d9:96:9c:50:34:d2:81:17:e3:cc:09:57:13:fc:ae:3b:
+        ed:ff:55:03:d5:c2:dd:a5:5a:f1:c5:66:55:9f:a2:77:74:2f:
+        76:84:93:7c:03:b9:c1:9f:df:41:20:06:57:e4:e2:eb:e7:10:
+        67:42:63:02:d1:a8:53:f1:4d:9b:91:71:37:e4:c2:02:dd:e1:
+        b9:04
 -----BEGIN CERTIFICATE-----
-MIICgzCCAewCAQYwDQYJKoZIhvcNAQEEBQAwgYwxCzAJBgNVBAYTAlVTMQswCQYD
-VQQIEwJDQTEPMA0GA1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAO
-BgNVBAsWB1VDSV9ET0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkB
-FhdwZ29udGxhQGRvYy5lY2UudWNpLmVkdTAeFw0wMTA2MTExODEwMzRaFw0xMTA2
-MDkxODEwMzRaMIGGMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExDzANBgNVBAcT
-BklydmluZTEQMA4GA1UEChMHVEFPK09DSTEMMAoGA1UECxMDT0NJMREwDwYDVQQD
-EwhQcml5YW5rYTEmMCQGCSqGSIb3DQEJARYXcGdvbnRsYUBkb2MuZWNlLnVjaS5l
-ZHUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL6f8pBX7Mi3FPY/OYBOq+kb
-wQ3WX0Z8+nDxd7AiWDAx2AL5EaX8xnUiRi96OJ+CYPCYOUlavGVzZkRVMFdOuHAn
-RvY2sCpvU2rkKpEx9Pd50l7FLnXJuflnRc6zIEKOvuQcPJvsP4AaxaFxTnZExXQJ
-kDEiQP3mGID/eXtUzywbAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAuvSoOnMB6sxj
-ft9YbdLeyATTPzHbxAb6zQo72DUmM3roNowUrefHymU8jZoC6HeaROeKCU0MkVes
-l/jYlz/OwSYkbyGNIUkq4DHEWKzXEg8M603fsWK6IK3T5iPBHY+l/mYSEHJPfypZ
-fl/y4YSNJZlrz6kCIHTcwfHXDRC1mjM=
+MIICeDCCAeGgAwIBAgICEAEwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
+EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
+NTE0MDEzNFoXDTMyMDUyNTE0MDEzNFowUTELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
+CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMRowGAYDVQQDExFCdWlsZCBD
+emFyIENsaWVudDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAz3+OQr+7wKYj
+fgekE7q2us1M7cScl0Yy3NXpY1lZuHwNepetPynd/EBOSMyyGxXEmFmosLA4I9LY
+gSInG3dk1kDAAkG226glTcah9QP2+orTHLWkqUylYhmJ49zYrGhHlg88EBrsAIEQ
+qhM9mUg6riusud5bIHwGTldkry2ziO8CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglg
+hkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0O
+BBYEFG8TuouR7foi3Cgm1HRcRqeysqkQMB8GA1UdIwQYMBaAFP1zvvQzMzgYn7mc
+adQS/oExlQMKMA0GCSqGSIb3DQEBBQUAA4GBALxv1cdooDyNOjlh/1CAx6O5KKrI
+e34trybhCjmUnaiUyM2C9aX80d89P1XHW/mJFHhZ1mQtMkIj2ZacUDTSgRfjzAlX
+E/yuO+3/VQPVwt2lWvHFZlWfond0L3aEk3wDucGf30EgBlfk4uvnEGdCYwLRqFPx
+TZuRcTfkwgLd4bkE
 -----END CERTIFICATE-----
diff --git a/orbsvcs/tests/Security/Big_Request/client_key.pem b/orbsvcs/tests/Security/Big_Request/client_key.pem
index 1428b501712..e761037f237 100644
--- a/orbsvcs/tests/Security/Big_Request/client_key.pem
+++ b/orbsvcs/tests/Security/Big_Request/client_key.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQC+n/KQV+zItxT2PzmATqvpG8EN1l9GfPpw8XewIlgwMdgC+RGl
-/MZ1IkYvejifgmDwmDlJWrxlc2ZEVTBXTrhwJ0b2NrAqb1Nq5CqRMfT3edJexS51
-ybn5Z0XOsyBCjr7kHDyb7D+AGsWhcU52RMV0CZAxIkD95hiA/3l7VM8sGwIDAQAB
-AoGABGaa6fwtqkCXykuRX0XxsBME9PXTA0SVX5AjjDxuvsYXz5HCd4uLZV7iMexn
-bD9NT6CkCe5/VPRCEyfIUuutVFc7lkPwuRw5FvNcf4gMH9ltufQfH/KeR7d2Jvge
-zrTOH7nicshy67mfOEOaoDphWoT9uy+7ayym+EsJLJU37VkCQQD6xLRu5r9tKX2/
-NfIQsGxF3TZyXgxcuxMh9JOq5E9nBwhr1JaXDbXktXfIK/F3XWHLFS8CIg6PhgGY
-i/+UtGzvAkEAwpoHp89U2jLdVRoIcwy5o7Ocwk3HCXem3UgFWXzzunGM1x+ozDFA
-uo5nyXiAO6Buka9C2czje275kE18BbqLlQJBAMJNf/EeYdzXdVOfHPzJdlt72CAt
-ty5y1ZRNyc10MgIGdQP4KObJ/NJFuZYkVmjCtm+A7neco+OZVcs5TsOOOYkCQBHQ
-6EKEyM/xODJCX+OolpZWK1PeqwpC2hQIM/Uta2L2Yl6Pl3SaTcLGptnbHmJXHchY
-s1YdW/ZBArgjX+dmXMECQApTKWbVLmNsEoOlHU/I/KhGsfuojrzBMMe3FKLiHpmu
-u86L3vu3OGZFcPgjazxWZcip8JekeJ7c+6suLNNRQ5I=
+MIICXQIBAAKBgQDPf45Cv7vApiN+B6QTura6zUztxJyXRjLc1eljWVm4fA16l60/
+Kd38QE5IzLIbFcSYWaiwsDgj0tiBIicbd2TWQMACQbbbqCVNxqH1A/b6itMctaSp
+TKViGYnj3NisaEeWDzwQGuwAgRCqEz2ZSDquK6y53lsgfAZOV2SvLbOI7wIDAQAB
+AoGACTQ0QDu2/U2hR2bZXVKr5k9S+Tz+YSto+Ci46II/G5LNGkH+Gk4mHZlQn6QM
+xmzJwqQ/ek7mvpgMqHW2XF6IZ3AUmgNqpKdkFMbmkRworAEGRHvJcXy6RhiZI4kv
+UQWc9qEBA6/iR/B0sGsCgTTkv4davCs+5You5+oSyRiRu7kCQQDuQTkSkNm7fwFS
+lrEGmJjzJ3gXMHuv/lL2n2HJV67BBv7Aq7JDdciVLr90chcmXkIwPCywbdWVV9jz
+HWQ6GXKTAkEA3vPm3CKRHMFoSGwiX6qhM2432yLIlpjlfmSj3S6LnhhTJhYS6KMO
+6Ddv4vZ20zl3r4GAaXOyMTtZ6vQlZ8W9tQJBAMvRAAHh6GF9RKRiRQ5ffHiGSzWL
+RERKTK6tqfmUCOsYENbCCr2rBOyaES6Ma0FnYTfiQlirnQslG3Lesd8B5gECQQDS
+FG6PNP8ZYmDaBRJqpIQayxtUoDT0OoPckgYZrvcd8/u9YoVUsfik9T+3U9dpdrgB
+JvyR4NOiMjOrAXyRiLEVAkA9DutrYXzznEAyOvEEtyK92Eb2oTpu1svzRATc/i0w
+UTwLkFi+1m24HJ5MIGyRTHsNj79lj5v5U91lGIINHXXU
 -----END RSA PRIVATE KEY-----
diff --git a/orbsvcs/tests/Security/Big_Request/run_test.pl b/orbsvcs/tests/Security/Big_Request/run_test.pl
index 8cf390c5e46..0876be7b4a3 100755
--- a/orbsvcs/tests/Security/Big_Request/run_test.pl
+++ b/orbsvcs/tests/Security/Big_Request/run_test.pl
@@ -7,10 +7,85 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 
 use lib "$ENV{ACE_ROOT}/bin";
 use PerlACE::TestTarget;
+use Getopt::Long;
 
 $status = 0;
+$opt = "";
 $debug_level = '0';
 $svc_conf = $PerlACE::svcconf_ext;
+$conf_client = "";
+$conf_server = "";
+
+sub options () {
+    my $help = 0;     # handled locally
+    my $man = 0;      # handled locally
+    my $ssl = 1;      # handled locally
+    my $dotdec = 0;   # handled locally
+    my $debug;        # handled locally
+    my $shost;        # handled locally
+    my $chost;        # handled locally
+    my $clog;         # handled locally
+    my $slog;         # handled locally
+
+    # Process options.
+    if ( @ARGV > 0 ) {
+        GetOptions ('help|?' => \$help,
+                'manual' => \$man,
+                'ssl' => \$ssl,
+                'dd=s' => \$dotdec,
+                'shost=s' => \$shost,
+                'chost=s' => \$chost,
+                'slog=s' => \$slog,
+                'clog=s' => \$clog,
+                'debug=i' => \$debug) or pod2usage(2);
+    }
+
+    if ($ssl) {
+        $conf_client = " -ORBSvcConf client$svc_conf";
+        $conf_server = " -ORBSvcConf server$svc_conf";
+    }
+
+    if ($debug) {
+        $opt = "$opt -ORBDebugLevel $debug";
+    }
+
+    if ($dotdec) {
+        if ($dotdec =~ /client/) {
+            $conf_client = "$conf_client -ORBDottedDecimalAddresses 1";
+        }
+        if ($dotdec =~ /server/) {
+            $conf_server = "$conf_server -ORBDottedDecimalAddresses 1";
+        }
+    }
+
+    if ($slog) {
+        $conf_server = "$conf_server -ORBLogFile $slog";
+    }
+
+    if ($clog) {
+        $conf_client = "$conf_client -ORBLogFile $clog";
+    }
+
+    if ($shost) {
+        $conf_server = "$conf_server -ORBListenEndpoints iiop:///hostname_in_ior=$shost";
+    }
+
+    if ($chost) {
+       $conf_client = "$conf_client -ORBListenEndpoints iiop:///hostname_in_ior=$chost";
+    }
+
+    if ( $man or $help ) {
+        # Load Pod::Usage only if needed.
+        require "Pod/Usage.pm";
+        import Pod::Usage;
+        pod2usage(1) if $help;
+        pod2usage(VERBOSE => 2) if $man;
+        return 0;
+    }
+    return 1;
+}
+
+options () or die "Error: Nothing executed";
 
 foreach $i (@ARGV) {
     if ($i eq '-debug') {
@@ -18,11 +93,6 @@ foreach $i (@ARGV) {
     }
 }
 
-# Set the SSL environment
-# This doesn't work on Windows.  For some reason,
-# environment variables aren't propagated to child processes.
-#$ENV{'SSL_CERT_FILE'} = 'cacert.pem';
-
 my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
 my $client = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n";
 
@@ -34,17 +104,20 @@ $client->DeleteFile($iorbase);
 
 
 $SV = $server->CreateProcess ("server",
-                              "-ORBdebuglevel $debug_level " .
-                              "-ORBSvcConf server$svc_conf " .
+                              "$conf_server " .
+                              "$opt " .
                               "-o $server_iorfile ");
 
 $CL = $client->CreateProcess ("client",
-                              "-ORBSvcConf client$svc_conf " .
+                              "$conf_client " .
+                              "$opt " .
                               "-k file://$client_iorfile " .
                               "-x");
 
 print STDERR "\n\n==== Running SSLIOP Big_Request test\n";
 
+print STDERR "Executing: server $conf_server $opt -o $iorbase\n";
+
 $server_status = $SV->Spawn ();
 
 if ($server_status != 0) {
@@ -70,6 +143,8 @@ if ($client->PutFile ($iorbase) == -1) {
     exit 1;
 }
 
+print STDERR "Executing: client $conf_client $opt\n";
+
 $client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval() + 165);
 
 if ($client_status != 0) {
diff --git a/orbsvcs/tests/Security/Big_Request/server_cert.pem b/orbsvcs/tests/Security/Big_Request/server_cert.pem
index 0fc394c24d7..5402ae2497a 100644
--- a/orbsvcs/tests/Security/Big_Request/server_cert.pem
+++ b/orbsvcs/tests/Security/Big_Request/server_cert.pem
@@ -1,16 +1,59 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 4096 (0x1000)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Tennessee, O=DOC Group
+        Validity
+            Not Before: Jun 15 14:01:15 2011 GMT
+            Not After : May 25 14:01:15 2032 GMT
+        Subject: C=US, ST=Tennessee, O=DOC Group, CN=DOC Group Build Czar Server
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:b2:03:27:b9:d6:24:a4:6d:e1:9f:0e:d7:8a:71:
+                    86:62:df:2b:f8:64:3b:51:53:e0:fa:71:9a:c2:10:
+                    40:97:bd:06:27:43:5a:1a:1c:62:f4:ca:3e:b3:b9:
+                    20:16:89:a2:aa:2e:1e:97:3a:70:3d:fe:f7:ff:ba:
+                    d5:1e:b2:68:07:7e:d0:68:18:8a:3b:aa:9c:01:0e:
+                    1e:ef:b5:97:96:d5:0b:a5:a0:fd:a3:02:21:b5:5a:
+                    6f:e4:c1:36:bf:61:7b:40:ac:73:03:3d:40:75:e7:
+                    9d:ba:22:ab:95:81:8b:74:9e:fa:df:27:18:a7:7f:
+                    23:83:36:f0:15:22:22:db:7b
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                0C:27:05:12:9B:D5:4B:F9:43:32:6B:77:7B:A2:0D:34:7F:6C:0A:BC
+            X509v3 Authority Key Identifier: 
+                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
+
+    Signature Algorithm: sha1WithRSAEncryption
+        0d:bf:65:2a:a5:02:75:6c:c4:5a:3c:1d:3c:25:51:16:1a:f8:
+        78:ad:49:f6:f4:a4:c1:97:e4:c8:0b:ac:9e:71:0e:be:1e:e6:
+        1d:2e:c7:d2:4f:1e:e8:c7:21:7c:58:27:0e:6d:93:11:7e:64:
+        24:57:44:c1:c1:5a:d0:76:82:79:70:82:36:06:f2:48:60:e8:
+        6a:20:a7:92:09:00:73:75:b2:f9:cb:97:35:d6:aa:8e:87:11:
+        20:e2:dd:8a:c3:9c:c4:aa:f0:57:04:4e:e2:b3:8b:fb:9a:4f:
+        4b:60:b7:2e:3b:89:98:38:02:25:24:ff:b1:f1:c0:ad:01:eb:
+        37:bd
 -----BEGIN CERTIFICATE-----
-MIICgzCCAewCAQMwDQYJKoZIhvcNAQEEBQAwgYwxCzAJBgNVBAYTAlVTMQswCQYD
-VQQIEwJDQTEPMA0GA1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAO
-BgNVBAsWB1VDSV9ET0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkB
-FhdwZ29udGxhQGRvYy5lY2UudWNpLmVkdTAeFw0wMTA2MTExNzQ4NTVaFw0xMTA2
-MDkxNzQ4NTVaMIGGMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExDzANBgNVBAcT
-BklydmluZTEMMAoGA1UEChMDT0NJMRAwDgYDVQQLEwdUQU8rT0NJMREwDwYDVQQD
-EwhQcml5YW5rYTEmMCQGCSqGSIb3DQEJARYXcGdvbnRsYUBkb2MuZWNlLnVjaS5l
-ZHUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANKXmudWiLVu/zdBlSr0/dlr
-pRe+Ie26cPyMo5lKiYNY77tABTiOXe5qLUEryjQ/fZ74gmBe4AYFwb7nu/f58X4A
-0tzSg2M4spWM7N4tzf+YbcUipRt9sEISxwfUxNNWTKnLxvCmkzOsISisukdzTkqJ
-fdzEcPfhO2BZKOdmlg1hAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAjUl3ami01tPY
-P1vMp2642dsIKLZis0TmeWp6HNpm52TbiGZOCqDrvtSQ9+2vGz0BkHvGqWKtD+wv
-zJH23fNnqFuzy1C1xtjoeqhXECTsWVTVdoEox8hSWxPiYRE2dioraZQQ5ENDosh+
-V9YcqJJpnKDUOSGVGuyaU7DpR8yK0pc=
+MIICgjCCAeugAwIBAgICEAAwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
+EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
+NTE0MDExNVoXDTMyMDUyNTE0MDExNVowWzELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
+CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMSQwIgYDVQQDExtET0MgR3Jv
+dXAgQnVpbGQgQ3phciBTZXJ2ZXIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
+ALIDJ7nWJKRt4Z8O14pxhmLfK/hkO1FT4PpxmsIQQJe9BidDWhocYvTKPrO5IBaJ
+oqouHpc6cD3+9/+61R6yaAd+0GgYijuqnAEOHu+1l5bVC6Wg/aMCIbVab+TBNr9h
+e0CscwM9QHXnnboiq5WBi3Se+t8nGKd/I4M28BUiItt7AgMBAAGjezB5MAkGA1Ud
+EwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmlj
+YXRlMB0GA1UdDgQWBBQMJwUSm9VL+UMya3d7og00f2wKvDAfBgNVHSMEGDAWgBT9
+c770MzM4GJ+5nGnUEv6BMZUDCjANBgkqhkiG9w0BAQUFAAOBgQANv2UqpQJ1bMRa
+PB08JVEWGvh4rUn29KTBl+TIC6yecQ6+HuYdLsfSTx7oxyF8WCcObZMRfmQkV0TB
+wVrQdoJ5cII2BvJIYOhqIKeSCQBzdbL5y5c11qqOhxEg4t2Kw5zEqvBXBE7is4v7
+mk9LYLcuO4mYOAIlJP+x8cCtAes3vQ==
 -----END CERTIFICATE-----
diff --git a/orbsvcs/tests/Security/Big_Request/server_key.pem b/orbsvcs/tests/Security/Big_Request/server_key.pem
index 567a41da6dc..be238899a9f 100644
--- a/orbsvcs/tests/Security/Big_Request/server_key.pem
+++ b/orbsvcs/tests/Security/Big_Request/server_key.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDSl5rnVoi1bv83QZUq9P3Za6UXviHtunD8jKOZSomDWO+7QAU4
-jl3uai1BK8o0P32e+IJgXuAGBcG+57v3+fF+ANLc0oNjOLKVjOzeLc3/mG3FIqUb
-fbBCEscH1MTTVkypy8bwppMzrCEorLpHc05KiX3cxHD34TtgWSjnZpYNYQIDAQAB
-AoGAC/TxpZrjLjH8KZ3+oy6/zv1upTd1Y7MHQT+W9lgmEKAXFHGhGkHzEVtT8HRV
-CbxlHIaNmH0qiQ0AoB82K/E0BdIMvE+y2qQwlpMfBMX6/TACORReJN3NXGsXwHP4
-/pNlS4LX7/NZbxlReAlDNP+FO8sdKZTyM3VXHFWJbmm4wsECQQD06zQ4uthp0zI9
-WTZiiAUgYwOcnLnXwfWOLAr8RCnYgwiS7MBCcmhZAgWX5SZJYVCwEJ12DAHy02NJ
-EhiSgo+JAkEA3B7PcS5FqZFi6wVjEG6yF8OuSb/rl+FZfV6utZdCVdMPxacEVxlD
-q7H/dk23O4WwASBriU0PR9/KG3T/LvKBGQJAaYRn1EUTdcxKqcmkt6CYbNKbvL59
-BqqGq4DoHrUTPjd92ybq0fXOZQKM/Fr6OsUVaTVPUYtsz3wpG1MTiRN82QJACX6+
-vggb8yuVU8QAuPW9cu769q1zsTKEVLcf3C9xKhiXppQEyOkLFT3xYh4KGGQ06meG
-m/6Z+SS7KCIM2+6UCQJBANHIzgxDWtrLuWJviNh9EbCsdMioxBH+LGaqFKLC70xD
-Pyoqn+QJQu/ekT+FUb0BeFJfGPzFjh1mFYn4tXxWqMs=
+MIICXgIBAAKBgQCyAye51iSkbeGfDteKcYZi3yv4ZDtRU+D6cZrCEECXvQYnQ1oa
+HGL0yj6zuSAWiaKqLh6XOnA9/vf/utUesmgHftBoGIo7qpwBDh7vtZeW1QuloP2j
+AiG1Wm/kwTa/YXtArHMDPUB15526IquVgYt0nvrfJxinfyODNvAVIiLbewIDAQAB
+AoGAMV1KoPBPjQGjtbYp84xz1etJiEJTaMQ3+XuTjQlwwCN9F1pIHEGO9482QCSw
+T0+vuj274fgktCyGnXY0L6UNz7+0wNhUj5oP2IeJdmgcJbv9tcR126rhryr4bx6H
+2sZdLL4MtxjzRNkURS748zeGET/NuIhpQ4YjnUJ27YOeNtECQQDiItcRkyfMcj+r
+/8JU8h9ifOV5tMOyPV4z6Hfli1X+Xa1OcIieE2nzkaa9LHPEi3+LNw41LItUDbMZ
+/Aztm4VVAkEAyYVbbbebVrgoOF7ueafHZeNToc96FEn04H+tN8AgwaI4+U1Q7oga
+EAjVD++e0NfUUJpeyiygBa9NlzB9XYXdjwJBAJobUCHD/R1Qxp96fn7ROh4uK1xT
+mgG/3JDXXc3qtMHSKScJfbDsXgoFOnI09vf8cQD4lhAauSCg7WtJ362VjLkCQQCu
+eVRoUNAgK78+1wo3sAiWcVRGQyDaEhH+kOxC2YhCvZYAWm1Yp+OQwGTfsEHbZRIA
+Wzb4adx+L4HJBYV1BGKHAkEAvSCAANbm8iaLkCG4EfEyrhIpbJDY2Cx3WO08+ZOz
+ekMspMikGmMQfXXroBpnJ8SGVLYSjf2hQQySwDa00hmyBA==
 -----END RSA PRIVATE KEY-----
diff --git a/orbsvcs/tests/Security/Bug_1107_Regression/cacert.pem b/orbsvcs/tests/Security/Bug_1107_Regression/cacert.pem
index a9e905f4e6c..d98dd5918cb 100644
--- a/orbsvcs/tests/Security/Bug_1107_Regression/cacert.pem
+++ b/orbsvcs/tests/Security/Bug_1107_Regression/cacert.pem
@@ -1,21 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIIDfTCCAuagAwIBAgIBADANBgkqhkiG9w0BAQQFADCBjDELMAkGA1UEBhMCVVMx
-CzAJBgNVBAgTAkNBMQ8wDQYDVQQHEwZJcnZpbmUxEjAQBgNVBAoTCURPQyBHcm91
-cDEQMA4GA1UECxYHVUNJX0RPQzERMA8GA1UEAxMIUHJpeWFua2ExJjAkBgkqhkiG
-9w0BCQEWF3Bnb250bGFAZG9jLmVjZS51Y2kuZWR1MB4XDTAxMDYxMTE3MjI0MVoX
-DTExMDYwOTE3MjI0MVowgYwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEPMA0G
-A1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAOBgNVBAsWB1VDSV9E
-T0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkBFhdwZ29udGxhQGRv
-Yy5lY2UudWNpLmVkdTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyFiCRDUH
-nGJqQG9jT/2PhZUAgfwXvIwfDM8m/WujCt/buDcrOz767shBsk4HZhW91Vm4mE03
-K1zfCzojRigf28uyB/rlp60p2Fq0wvZBNNU5Muia6esleR4unb4QslOpcFhct/9n
-UPnlnnsZOTaGWaELNKEjYfHqPh8PQ0lYurECAwEAAaOB7DCB6TAdBgNVHQ4EFgQU
-0Y6IZjkLbLbtZ5aoKLcfd7Yc/kYwgbkGA1UdIwSBsTCBroAU0Y6IZjkLbLbtZ5ao
-KLcfd7Yc/kahgZKkgY8wgYwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEPMA0G
-A1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAOBgNVBAsWB1VDSV9E
-T0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkBFhdwZ29udGxhQGRv
-Yy5lY2UudWNpLmVkdYIBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4GB
-AHYi8ulIzUI3p3+Ma16rumZxvKcmkJJbU6fpAv4ZvK6AWyy+6Ja0GD5N3SGEx+xU
-nMffTR+LePa9PAZiR7dNkF6ikPxXZu4jn8KY2zFT3SB/VjCoEetR9i9QI//O0Fea
-3yZ0NygNWe5cyVDLCb4meucJpsClfyL28DWzMwD2liX3
+MIICgDCCAemgAwIBAgIJAO8E230uBaq+MA0GCSqGSIb3DQEBBQUAMDUxCzAJBgNV
+BAYTAlVTMRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDAe
+Fw0xMTA2MTUxMzU2MDRaFw0yMTA2MTIxMzU2MDRaMDUxCzAJBgNVBAYTAlVTMRIw
+EAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAxzlgJm5rZMTZEQCa7m3/JPbykh4FT7DwcrWBgDRF
+Jk0wgi4K7AKOFdCfOMqbW1Ps5ITbzgwq2yNXOrocKYs//02ewppKx5bxOE5wTA9v
+qwvaoJUeQ8PVEY+RVi2z+CP1xFIVKOCJtrg5WwWE9Vwvu3iyTe95dR1T95Hkrl0I
+yHECAwEAAaOBlzCBlDAdBgNVHQ4EFgQU/XO+9DMzOBifuZxp1BL+gTGVAwowZQYD
+VR0jBF4wXIAU/XO+9DMzOBifuZxp1BL+gTGVAwqhOaQ3MDUxCzAJBgNVBAYTAlVT
+MRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cIIJAO8E230u
+Baq+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAUxxR/7U35mIGJ7c/
+KfZZYze4/Aio7mf9QG0DA55F9DlB16IOJuRXqeMY2Lo+WFo7pszDX8TbucWtWJC6
+pMIVamWLTpgfVrWeTcafio/puqTALKfZ5LHzHieu1QNvFPQxMx1DZ5Eawowhl7ua
+4ERB9b/3K4StZjMUkPmBolSIkPo=
 -----END CERTIFICATE-----
diff --git a/orbsvcs/tests/Security/Bug_1107_Regression/client_cert.pem b/orbsvcs/tests/Security/Bug_1107_Regression/client_cert.pem
index 0bebb696cfc..b86bd5de1d2 100644
--- a/orbsvcs/tests/Security/Bug_1107_Regression/client_cert.pem
+++ b/orbsvcs/tests/Security/Bug_1107_Regression/client_cert.pem
@@ -1,16 +1,59 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 4097 (0x1001)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Tennessee, O=DOC Group
+        Validity
+            Not Before: Jun 15 14:01:34 2011 GMT
+            Not After : May 25 14:01:34 2032 GMT
+        Subject: C=US, ST=Tennessee, O=DOC Group, CN=Build Czar Client
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:cf:7f:8e:42:bf:bb:c0:a6:23:7e:07:a4:13:ba:
+                    b6:ba:cd:4c:ed:c4:9c:97:46:32:dc:d5:e9:63:59:
+                    59:b8:7c:0d:7a:97:ad:3f:29:dd:fc:40:4e:48:cc:
+                    b2:1b:15:c4:98:59:a8:b0:b0:38:23:d2:d8:81:22:
+                    27:1b:77:64:d6:40:c0:02:41:b6:db:a8:25:4d:c6:
+                    a1:f5:03:f6:fa:8a:d3:1c:b5:a4:a9:4c:a5:62:19:
+                    89:e3:dc:d8:ac:68:47:96:0f:3c:10:1a:ec:00:81:
+                    10:aa:13:3d:99:48:3a:ae:2b:ac:b9:de:5b:20:7c:
+                    06:4e:57:64:af:2d:b3:88:ef
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                6F:13:BA:8B:91:ED:FA:22:DC:28:26:D4:74:5C:46:A7:B2:B2:A9:10
+            X509v3 Authority Key Identifier: 
+                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
+
+    Signature Algorithm: sha1WithRSAEncryption
+        bc:6f:d5:c7:68:a0:3c:8d:3a:39:61:ff:50:80:c7:a3:b9:28:
+        aa:c8:7b:7e:2d:af:26:e1:0a:39:94:9d:a8:94:c8:cd:82:f5:
+        a5:fc:d1:df:3d:3f:55:c7:5b:f9:89:14:78:59:d6:64:2d:32:
+        42:23:d9:96:9c:50:34:d2:81:17:e3:cc:09:57:13:fc:ae:3b:
+        ed:ff:55:03:d5:c2:dd:a5:5a:f1:c5:66:55:9f:a2:77:74:2f:
+        76:84:93:7c:03:b9:c1:9f:df:41:20:06:57:e4:e2:eb:e7:10:
+        67:42:63:02:d1:a8:53:f1:4d:9b:91:71:37:e4:c2:02:dd:e1:
+        b9:04
 -----BEGIN CERTIFICATE-----
-MIICgzCCAewCAQYwDQYJKoZIhvcNAQEEBQAwgYwxCzAJBgNVBAYTAlVTMQswCQYD
-VQQIEwJDQTEPMA0GA1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAO
-BgNVBAsWB1VDSV9ET0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkB
-FhdwZ29udGxhQGRvYy5lY2UudWNpLmVkdTAeFw0wMTA2MTExODEwMzRaFw0xMTA2
-MDkxODEwMzRaMIGGMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExDzANBgNVBAcT
-BklydmluZTEQMA4GA1UEChMHVEFPK09DSTEMMAoGA1UECxMDT0NJMREwDwYDVQQD
-EwhQcml5YW5rYTEmMCQGCSqGSIb3DQEJARYXcGdvbnRsYUBkb2MuZWNlLnVjaS5l
-ZHUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL6f8pBX7Mi3FPY/OYBOq+kb
-wQ3WX0Z8+nDxd7AiWDAx2AL5EaX8xnUiRi96OJ+CYPCYOUlavGVzZkRVMFdOuHAn
-RvY2sCpvU2rkKpEx9Pd50l7FLnXJuflnRc6zIEKOvuQcPJvsP4AaxaFxTnZExXQJ
-kDEiQP3mGID/eXtUzywbAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAuvSoOnMB6sxj
-ft9YbdLeyATTPzHbxAb6zQo72DUmM3roNowUrefHymU8jZoC6HeaROeKCU0MkVes
-l/jYlz/OwSYkbyGNIUkq4DHEWKzXEg8M603fsWK6IK3T5iPBHY+l/mYSEHJPfypZ
-fl/y4YSNJZlrz6kCIHTcwfHXDRC1mjM=
+MIICeDCCAeGgAwIBAgICEAEwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
+EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
+NTE0MDEzNFoXDTMyMDUyNTE0MDEzNFowUTELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
+CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMRowGAYDVQQDExFCdWlsZCBD
+emFyIENsaWVudDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAz3+OQr+7wKYj
+fgekE7q2us1M7cScl0Yy3NXpY1lZuHwNepetPynd/EBOSMyyGxXEmFmosLA4I9LY
+gSInG3dk1kDAAkG226glTcah9QP2+orTHLWkqUylYhmJ49zYrGhHlg88EBrsAIEQ
+qhM9mUg6riusud5bIHwGTldkry2ziO8CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglg
+hkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0O
+BBYEFG8TuouR7foi3Cgm1HRcRqeysqkQMB8GA1UdIwQYMBaAFP1zvvQzMzgYn7mc
+adQS/oExlQMKMA0GCSqGSIb3DQEBBQUAA4GBALxv1cdooDyNOjlh/1CAx6O5KKrI
+e34trybhCjmUnaiUyM2C9aX80d89P1XHW/mJFHhZ1mQtMkIj2ZacUDTSgRfjzAlX
+E/yuO+3/VQPVwt2lWvHFZlWfond0L3aEk3wDucGf30EgBlfk4uvnEGdCYwLRqFPx
+TZuRcTfkwgLd4bkE
 -----END CERTIFICATE-----
diff --git a/orbsvcs/tests/Security/Bug_1107_Regression/client_key.pem b/orbsvcs/tests/Security/Bug_1107_Regression/client_key.pem
index 1428b501712..e761037f237 100644
--- a/orbsvcs/tests/Security/Bug_1107_Regression/client_key.pem
+++ b/orbsvcs/tests/Security/Bug_1107_Regression/client_key.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQC+n/KQV+zItxT2PzmATqvpG8EN1l9GfPpw8XewIlgwMdgC+RGl
-/MZ1IkYvejifgmDwmDlJWrxlc2ZEVTBXTrhwJ0b2NrAqb1Nq5CqRMfT3edJexS51
-ybn5Z0XOsyBCjr7kHDyb7D+AGsWhcU52RMV0CZAxIkD95hiA/3l7VM8sGwIDAQAB
-AoGABGaa6fwtqkCXykuRX0XxsBME9PXTA0SVX5AjjDxuvsYXz5HCd4uLZV7iMexn
-bD9NT6CkCe5/VPRCEyfIUuutVFc7lkPwuRw5FvNcf4gMH9ltufQfH/KeR7d2Jvge
-zrTOH7nicshy67mfOEOaoDphWoT9uy+7ayym+EsJLJU37VkCQQD6xLRu5r9tKX2/
-NfIQsGxF3TZyXgxcuxMh9JOq5E9nBwhr1JaXDbXktXfIK/F3XWHLFS8CIg6PhgGY
-i/+UtGzvAkEAwpoHp89U2jLdVRoIcwy5o7Ocwk3HCXem3UgFWXzzunGM1x+ozDFA
-uo5nyXiAO6Buka9C2czje275kE18BbqLlQJBAMJNf/EeYdzXdVOfHPzJdlt72CAt
-ty5y1ZRNyc10MgIGdQP4KObJ/NJFuZYkVmjCtm+A7neco+OZVcs5TsOOOYkCQBHQ
-6EKEyM/xODJCX+OolpZWK1PeqwpC2hQIM/Uta2L2Yl6Pl3SaTcLGptnbHmJXHchY
-s1YdW/ZBArgjX+dmXMECQApTKWbVLmNsEoOlHU/I/KhGsfuojrzBMMe3FKLiHpmu
-u86L3vu3OGZFcPgjazxWZcip8JekeJ7c+6suLNNRQ5I=
+MIICXQIBAAKBgQDPf45Cv7vApiN+B6QTura6zUztxJyXRjLc1eljWVm4fA16l60/
+Kd38QE5IzLIbFcSYWaiwsDgj0tiBIicbd2TWQMACQbbbqCVNxqH1A/b6itMctaSp
+TKViGYnj3NisaEeWDzwQGuwAgRCqEz2ZSDquK6y53lsgfAZOV2SvLbOI7wIDAQAB
+AoGACTQ0QDu2/U2hR2bZXVKr5k9S+Tz+YSto+Ci46II/G5LNGkH+Gk4mHZlQn6QM
+xmzJwqQ/ek7mvpgMqHW2XF6IZ3AUmgNqpKdkFMbmkRworAEGRHvJcXy6RhiZI4kv
+UQWc9qEBA6/iR/B0sGsCgTTkv4davCs+5You5+oSyRiRu7kCQQDuQTkSkNm7fwFS
+lrEGmJjzJ3gXMHuv/lL2n2HJV67BBv7Aq7JDdciVLr90chcmXkIwPCywbdWVV9jz
+HWQ6GXKTAkEA3vPm3CKRHMFoSGwiX6qhM2432yLIlpjlfmSj3S6LnhhTJhYS6KMO
+6Ddv4vZ20zl3r4GAaXOyMTtZ6vQlZ8W9tQJBAMvRAAHh6GF9RKRiRQ5ffHiGSzWL
+RERKTK6tqfmUCOsYENbCCr2rBOyaES6Ma0FnYTfiQlirnQslG3Lesd8B5gECQQDS
+FG6PNP8ZYmDaBRJqpIQayxtUoDT0OoPckgYZrvcd8/u9YoVUsfik9T+3U9dpdrgB
+JvyR4NOiMjOrAXyRiLEVAkA9DutrYXzznEAyOvEEtyK92Eb2oTpu1svzRATc/i0w
+UTwLkFi+1m24HJ5MIGyRTHsNj79lj5v5U91lGIINHXXU
 -----END RSA PRIVATE KEY-----
diff --git a/orbsvcs/tests/Security/Bug_1107_Regression/server_cert.pem b/orbsvcs/tests/Security/Bug_1107_Regression/server_cert.pem
index 0fc394c24d7..5402ae2497a 100644
--- a/orbsvcs/tests/Security/Bug_1107_Regression/server_cert.pem
+++ b/orbsvcs/tests/Security/Bug_1107_Regression/server_cert.pem
@@ -1,16 +1,59 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 4096 (0x1000)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Tennessee, O=DOC Group
+        Validity
+            Not Before: Jun 15 14:01:15 2011 GMT
+            Not After : May 25 14:01:15 2032 GMT
+        Subject: C=US, ST=Tennessee, O=DOC Group, CN=DOC Group Build Czar Server
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:b2:03:27:b9:d6:24:a4:6d:e1:9f:0e:d7:8a:71:
+                    86:62:df:2b:f8:64:3b:51:53:e0:fa:71:9a:c2:10:
+                    40:97:bd:06:27:43:5a:1a:1c:62:f4:ca:3e:b3:b9:
+                    20:16:89:a2:aa:2e:1e:97:3a:70:3d:fe:f7:ff:ba:
+                    d5:1e:b2:68:07:7e:d0:68:18:8a:3b:aa:9c:01:0e:
+                    1e:ef:b5:97:96:d5:0b:a5:a0:fd:a3:02:21:b5:5a:
+                    6f:e4:c1:36:bf:61:7b:40:ac:73:03:3d:40:75:e7:
+                    9d:ba:22:ab:95:81:8b:74:9e:fa:df:27:18:a7:7f:
+                    23:83:36:f0:15:22:22:db:7b
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                0C:27:05:12:9B:D5:4B:F9:43:32:6B:77:7B:A2:0D:34:7F:6C:0A:BC
+            X509v3 Authority Key Identifier: 
+                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
+
+    Signature Algorithm: sha1WithRSAEncryption
+        0d:bf:65:2a:a5:02:75:6c:c4:5a:3c:1d:3c:25:51:16:1a:f8:
+        78:ad:49:f6:f4:a4:c1:97:e4:c8:0b:ac:9e:71:0e:be:1e:e6:
+        1d:2e:c7:d2:4f:1e:e8:c7:21:7c:58:27:0e:6d:93:11:7e:64:
+        24:57:44:c1:c1:5a:d0:76:82:79:70:82:36:06:f2:48:60:e8:
+        6a:20:a7:92:09:00:73:75:b2:f9:cb:97:35:d6:aa:8e:87:11:
+        20:e2:dd:8a:c3:9c:c4:aa:f0:57:04:4e:e2:b3:8b:fb:9a:4f:
+        4b:60:b7:2e:3b:89:98:38:02:25:24:ff:b1:f1:c0:ad:01:eb:
+        37:bd
 -----BEGIN CERTIFICATE-----
-MIICgzCCAewCAQMwDQYJKoZIhvcNAQEEBQAwgYwxCzAJBgNVBAYTAlVTMQswCQYD
-VQQIEwJDQTEPMA0GA1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAO
-BgNVBAsWB1VDSV9ET0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkB
-FhdwZ29udGxhQGRvYy5lY2UudWNpLmVkdTAeFw0wMTA2MTExNzQ4NTVaFw0xMTA2
-MDkxNzQ4NTVaMIGGMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExDzANBgNVBAcT
-BklydmluZTEMMAoGA1UEChMDT0NJMRAwDgYDVQQLEwdUQU8rT0NJMREwDwYDVQQD
-EwhQcml5YW5rYTEmMCQGCSqGSIb3DQEJARYXcGdvbnRsYUBkb2MuZWNlLnVjaS5l
-ZHUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANKXmudWiLVu/zdBlSr0/dlr
-pRe+Ie26cPyMo5lKiYNY77tABTiOXe5qLUEryjQ/fZ74gmBe4AYFwb7nu/f58X4A
-0tzSg2M4spWM7N4tzf+YbcUipRt9sEISxwfUxNNWTKnLxvCmkzOsISisukdzTkqJ
-fdzEcPfhO2BZKOdmlg1hAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAjUl3ami01tPY
-P1vMp2642dsIKLZis0TmeWp6HNpm52TbiGZOCqDrvtSQ9+2vGz0BkHvGqWKtD+wv
-zJH23fNnqFuzy1C1xtjoeqhXECTsWVTVdoEox8hSWxPiYRE2dioraZQQ5ENDosh+
-V9YcqJJpnKDUOSGVGuyaU7DpR8yK0pc=
+MIICgjCCAeugAwIBAgICEAAwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
+EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
+NTE0MDExNVoXDTMyMDUyNTE0MDExNVowWzELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
+CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMSQwIgYDVQQDExtET0MgR3Jv
+dXAgQnVpbGQgQ3phciBTZXJ2ZXIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
+ALIDJ7nWJKRt4Z8O14pxhmLfK/hkO1FT4PpxmsIQQJe9BidDWhocYvTKPrO5IBaJ
+oqouHpc6cD3+9/+61R6yaAd+0GgYijuqnAEOHu+1l5bVC6Wg/aMCIbVab+TBNr9h
+e0CscwM9QHXnnboiq5WBi3Se+t8nGKd/I4M28BUiItt7AgMBAAGjezB5MAkGA1Ud
+EwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmlj
+YXRlMB0GA1UdDgQWBBQMJwUSm9VL+UMya3d7og00f2wKvDAfBgNVHSMEGDAWgBT9
+c770MzM4GJ+5nGnUEv6BMZUDCjANBgkqhkiG9w0BAQUFAAOBgQANv2UqpQJ1bMRa
+PB08JVEWGvh4rUn29KTBl+TIC6yecQ6+HuYdLsfSTx7oxyF8WCcObZMRfmQkV0TB
+wVrQdoJ5cII2BvJIYOhqIKeSCQBzdbL5y5c11qqOhxEg4t2Kw5zEqvBXBE7is4v7
+mk9LYLcuO4mYOAIlJP+x8cCtAes3vQ==
 -----END CERTIFICATE-----
diff --git a/orbsvcs/tests/Security/Bug_1107_Regression/server_key.pem b/orbsvcs/tests/Security/Bug_1107_Regression/server_key.pem
index 567a41da6dc..be238899a9f 100644
--- a/orbsvcs/tests/Security/Bug_1107_Regression/server_key.pem
+++ b/orbsvcs/tests/Security/Bug_1107_Regression/server_key.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDSl5rnVoi1bv83QZUq9P3Za6UXviHtunD8jKOZSomDWO+7QAU4
-jl3uai1BK8o0P32e+IJgXuAGBcG+57v3+fF+ANLc0oNjOLKVjOzeLc3/mG3FIqUb
-fbBCEscH1MTTVkypy8bwppMzrCEorLpHc05KiX3cxHD34TtgWSjnZpYNYQIDAQAB
-AoGAC/TxpZrjLjH8KZ3+oy6/zv1upTd1Y7MHQT+W9lgmEKAXFHGhGkHzEVtT8HRV
-CbxlHIaNmH0qiQ0AoB82K/E0BdIMvE+y2qQwlpMfBMX6/TACORReJN3NXGsXwHP4
-/pNlS4LX7/NZbxlReAlDNP+FO8sdKZTyM3VXHFWJbmm4wsECQQD06zQ4uthp0zI9
-WTZiiAUgYwOcnLnXwfWOLAr8RCnYgwiS7MBCcmhZAgWX5SZJYVCwEJ12DAHy02NJ
-EhiSgo+JAkEA3B7PcS5FqZFi6wVjEG6yF8OuSb/rl+FZfV6utZdCVdMPxacEVxlD
-q7H/dk23O4WwASBriU0PR9/KG3T/LvKBGQJAaYRn1EUTdcxKqcmkt6CYbNKbvL59
-BqqGq4DoHrUTPjd92ybq0fXOZQKM/Fr6OsUVaTVPUYtsz3wpG1MTiRN82QJACX6+
-vggb8yuVU8QAuPW9cu769q1zsTKEVLcf3C9xKhiXppQEyOkLFT3xYh4KGGQ06meG
-m/6Z+SS7KCIM2+6UCQJBANHIzgxDWtrLuWJviNh9EbCsdMioxBH+LGaqFKLC70xD
-Pyoqn+QJQu/ekT+FUb0BeFJfGPzFjh1mFYn4tXxWqMs=
+MIICXgIBAAKBgQCyAye51iSkbeGfDteKcYZi3yv4ZDtRU+D6cZrCEECXvQYnQ1oa
+HGL0yj6zuSAWiaKqLh6XOnA9/vf/utUesmgHftBoGIo7qpwBDh7vtZeW1QuloP2j
+AiG1Wm/kwTa/YXtArHMDPUB15526IquVgYt0nvrfJxinfyODNvAVIiLbewIDAQAB
+AoGAMV1KoPBPjQGjtbYp84xz1etJiEJTaMQ3+XuTjQlwwCN9F1pIHEGO9482QCSw
+T0+vuj274fgktCyGnXY0L6UNz7+0wNhUj5oP2IeJdmgcJbv9tcR126rhryr4bx6H
+2sZdLL4MtxjzRNkURS748zeGET/NuIhpQ4YjnUJ27YOeNtECQQDiItcRkyfMcj+r
+/8JU8h9ifOV5tMOyPV4z6Hfli1X+Xa1OcIieE2nzkaa9LHPEi3+LNw41LItUDbMZ
+/Aztm4VVAkEAyYVbbbebVrgoOF7ueafHZeNToc96FEn04H+tN8AgwaI4+U1Q7oga
+EAjVD++e0NfUUJpeyiygBa9NlzB9XYXdjwJBAJobUCHD/R1Qxp96fn7ROh4uK1xT
+mgG/3JDXXc3qtMHSKScJfbDsXgoFOnI09vf8cQD4lhAauSCg7WtJ362VjLkCQQCu
+eVRoUNAgK78+1wo3sAiWcVRGQyDaEhH+kOxC2YhCvZYAWm1Yp+OQwGTfsEHbZRIA
+Wzb4adx+L4HJBYV1BGKHAkEAvSCAANbm8iaLkCG4EfEyrhIpbJDY2Cx3WO08+ZOz
+ekMspMikGmMQfXXroBpnJ8SGVLYSjf2hQQySwDa00hmyBA==
 -----END RSA PRIVATE KEY-----
diff --git a/orbsvcs/tests/Security/Callback/cacert.pem b/orbsvcs/tests/Security/Callback/cacert.pem
index a9e905f4e6c..d98dd5918cb 100644
--- a/orbsvcs/tests/Security/Callback/cacert.pem
+++ b/orbsvcs/tests/Security/Callback/cacert.pem
@@ -1,21 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIIDfTCCAuagAwIBAgIBADANBgkqhkiG9w0BAQQFADCBjDELMAkGA1UEBhMCVVMx
-CzAJBgNVBAgTAkNBMQ8wDQYDVQQHEwZJcnZpbmUxEjAQBgNVBAoTCURPQyBHcm91
-cDEQMA4GA1UECxYHVUNJX0RPQzERMA8GA1UEAxMIUHJpeWFua2ExJjAkBgkqhkiG
-9w0BCQEWF3Bnb250bGFAZG9jLmVjZS51Y2kuZWR1MB4XDTAxMDYxMTE3MjI0MVoX
-DTExMDYwOTE3MjI0MVowgYwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEPMA0G
-A1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAOBgNVBAsWB1VDSV9E
-T0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkBFhdwZ29udGxhQGRv
-Yy5lY2UudWNpLmVkdTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyFiCRDUH
-nGJqQG9jT/2PhZUAgfwXvIwfDM8m/WujCt/buDcrOz767shBsk4HZhW91Vm4mE03
-K1zfCzojRigf28uyB/rlp60p2Fq0wvZBNNU5Muia6esleR4unb4QslOpcFhct/9n
-UPnlnnsZOTaGWaELNKEjYfHqPh8PQ0lYurECAwEAAaOB7DCB6TAdBgNVHQ4EFgQU
-0Y6IZjkLbLbtZ5aoKLcfd7Yc/kYwgbkGA1UdIwSBsTCBroAU0Y6IZjkLbLbtZ5ao
-KLcfd7Yc/kahgZKkgY8wgYwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEPMA0G
-A1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAOBgNVBAsWB1VDSV9E
-T0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkBFhdwZ29udGxhQGRv
-Yy5lY2UudWNpLmVkdYIBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4GB
-AHYi8ulIzUI3p3+Ma16rumZxvKcmkJJbU6fpAv4ZvK6AWyy+6Ja0GD5N3SGEx+xU
-nMffTR+LePa9PAZiR7dNkF6ikPxXZu4jn8KY2zFT3SB/VjCoEetR9i9QI//O0Fea
-3yZ0NygNWe5cyVDLCb4meucJpsClfyL28DWzMwD2liX3
+MIICgDCCAemgAwIBAgIJAO8E230uBaq+MA0GCSqGSIb3DQEBBQUAMDUxCzAJBgNV
+BAYTAlVTMRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDAe
+Fw0xMTA2MTUxMzU2MDRaFw0yMTA2MTIxMzU2MDRaMDUxCzAJBgNVBAYTAlVTMRIw
+EAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAxzlgJm5rZMTZEQCa7m3/JPbykh4FT7DwcrWBgDRF
+Jk0wgi4K7AKOFdCfOMqbW1Ps5ITbzgwq2yNXOrocKYs//02ewppKx5bxOE5wTA9v
+qwvaoJUeQ8PVEY+RVi2z+CP1xFIVKOCJtrg5WwWE9Vwvu3iyTe95dR1T95Hkrl0I
+yHECAwEAAaOBlzCBlDAdBgNVHQ4EFgQU/XO+9DMzOBifuZxp1BL+gTGVAwowZQYD
+VR0jBF4wXIAU/XO+9DMzOBifuZxp1BL+gTGVAwqhOaQ3MDUxCzAJBgNVBAYTAlVT
+MRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cIIJAO8E230u
+Baq+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAUxxR/7U35mIGJ7c/
+KfZZYze4/Aio7mf9QG0DA55F9DlB16IOJuRXqeMY2Lo+WFo7pszDX8TbucWtWJC6
+pMIVamWLTpgfVrWeTcafio/puqTALKfZ5LHzHieu1QNvFPQxMx1DZ5Eawowhl7ua
+4ERB9b/3K4StZjMUkPmBolSIkPo=
 -----END CERTIFICATE-----
diff --git a/orbsvcs/tests/Security/Callback/client_cert.pem b/orbsvcs/tests/Security/Callback/client_cert.pem
index 0bebb696cfc..b86bd5de1d2 100644
--- a/orbsvcs/tests/Security/Callback/client_cert.pem
+++ b/orbsvcs/tests/Security/Callback/client_cert.pem
@@ -1,16 +1,59 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 4097 (0x1001)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Tennessee, O=DOC Group
+        Validity
+            Not Before: Jun 15 14:01:34 2011 GMT
+            Not After : May 25 14:01:34 2032 GMT
+        Subject: C=US, ST=Tennessee, O=DOC Group, CN=Build Czar Client
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:cf:7f:8e:42:bf:bb:c0:a6:23:7e:07:a4:13:ba:
+                    b6:ba:cd:4c:ed:c4:9c:97:46:32:dc:d5:e9:63:59:
+                    59:b8:7c:0d:7a:97:ad:3f:29:dd:fc:40:4e:48:cc:
+                    b2:1b:15:c4:98:59:a8:b0:b0:38:23:d2:d8:81:22:
+                    27:1b:77:64:d6:40:c0:02:41:b6:db:a8:25:4d:c6:
+                    a1:f5:03:f6:fa:8a:d3:1c:b5:a4:a9:4c:a5:62:19:
+                    89:e3:dc:d8:ac:68:47:96:0f:3c:10:1a:ec:00:81:
+                    10:aa:13:3d:99:48:3a:ae:2b:ac:b9:de:5b:20:7c:
+                    06:4e:57:64:af:2d:b3:88:ef
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                6F:13:BA:8B:91:ED:FA:22:DC:28:26:D4:74:5C:46:A7:B2:B2:A9:10
+            X509v3 Authority Key Identifier: 
+                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
+
+    Signature Algorithm: sha1WithRSAEncryption
+        bc:6f:d5:c7:68:a0:3c:8d:3a:39:61:ff:50:80:c7:a3:b9:28:
+        aa:c8:7b:7e:2d:af:26:e1:0a:39:94:9d:a8:94:c8:cd:82:f5:
+        a5:fc:d1:df:3d:3f:55:c7:5b:f9:89:14:78:59:d6:64:2d:32:
+        42:23:d9:96:9c:50:34:d2:81:17:e3:cc:09:57:13:fc:ae:3b:
+        ed:ff:55:03:d5:c2:dd:a5:5a:f1:c5:66:55:9f:a2:77:74:2f:
+        76:84:93:7c:03:b9:c1:9f:df:41:20:06:57:e4:e2:eb:e7:10:
+        67:42:63:02:d1:a8:53:f1:4d:9b:91:71:37:e4:c2:02:dd:e1:
+        b9:04
 -----BEGIN CERTIFICATE-----
-MIICgzCCAewCAQYwDQYJKoZIhvcNAQEEBQAwgYwxCzAJBgNVBAYTAlVTMQswCQYD
-VQQIEwJDQTEPMA0GA1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAO
-BgNVBAsWB1VDSV9ET0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkB
-FhdwZ29udGxhQGRvYy5lY2UudWNpLmVkdTAeFw0wMTA2MTExODEwMzRaFw0xMTA2
-MDkxODEwMzRaMIGGMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExDzANBgNVBAcT
-BklydmluZTEQMA4GA1UEChMHVEFPK09DSTEMMAoGA1UECxMDT0NJMREwDwYDVQQD
-EwhQcml5YW5rYTEmMCQGCSqGSIb3DQEJARYXcGdvbnRsYUBkb2MuZWNlLnVjaS5l
-ZHUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL6f8pBX7Mi3FPY/OYBOq+kb
-wQ3WX0Z8+nDxd7AiWDAx2AL5EaX8xnUiRi96OJ+CYPCYOUlavGVzZkRVMFdOuHAn
-RvY2sCpvU2rkKpEx9Pd50l7FLnXJuflnRc6zIEKOvuQcPJvsP4AaxaFxTnZExXQJ
-kDEiQP3mGID/eXtUzywbAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAuvSoOnMB6sxj
-ft9YbdLeyATTPzHbxAb6zQo72DUmM3roNowUrefHymU8jZoC6HeaROeKCU0MkVes
-l/jYlz/OwSYkbyGNIUkq4DHEWKzXEg8M603fsWK6IK3T5iPBHY+l/mYSEHJPfypZ
-fl/y4YSNJZlrz6kCIHTcwfHXDRC1mjM=
+MIICeDCCAeGgAwIBAgICEAEwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
+EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
+NTE0MDEzNFoXDTMyMDUyNTE0MDEzNFowUTELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
+CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMRowGAYDVQQDExFCdWlsZCBD
+emFyIENsaWVudDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAz3+OQr+7wKYj
+fgekE7q2us1M7cScl0Yy3NXpY1lZuHwNepetPynd/EBOSMyyGxXEmFmosLA4I9LY
+gSInG3dk1kDAAkG226glTcah9QP2+orTHLWkqUylYhmJ49zYrGhHlg88EBrsAIEQ
+qhM9mUg6riusud5bIHwGTldkry2ziO8CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglg
+hkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0O
+BBYEFG8TuouR7foi3Cgm1HRcRqeysqkQMB8GA1UdIwQYMBaAFP1zvvQzMzgYn7mc
+adQS/oExlQMKMA0GCSqGSIb3DQEBBQUAA4GBALxv1cdooDyNOjlh/1CAx6O5KKrI
+e34trybhCjmUnaiUyM2C9aX80d89P1XHW/mJFHhZ1mQtMkIj2ZacUDTSgRfjzAlX
+E/yuO+3/VQPVwt2lWvHFZlWfond0L3aEk3wDucGf30EgBlfk4uvnEGdCYwLRqFPx
+TZuRcTfkwgLd4bkE
 -----END CERTIFICATE-----
diff --git a/orbsvcs/tests/Security/Callback/client_key.pem b/orbsvcs/tests/Security/Callback/client_key.pem
index 1428b501712..e761037f237 100644
--- a/orbsvcs/tests/Security/Callback/client_key.pem
+++ b/orbsvcs/tests/Security/Callback/client_key.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQC+n/KQV+zItxT2PzmATqvpG8EN1l9GfPpw8XewIlgwMdgC+RGl
-/MZ1IkYvejifgmDwmDlJWrxlc2ZEVTBXTrhwJ0b2NrAqb1Nq5CqRMfT3edJexS51
-ybn5Z0XOsyBCjr7kHDyb7D+AGsWhcU52RMV0CZAxIkD95hiA/3l7VM8sGwIDAQAB
-AoGABGaa6fwtqkCXykuRX0XxsBME9PXTA0SVX5AjjDxuvsYXz5HCd4uLZV7iMexn
-bD9NT6CkCe5/VPRCEyfIUuutVFc7lkPwuRw5FvNcf4gMH9ltufQfH/KeR7d2Jvge
-zrTOH7nicshy67mfOEOaoDphWoT9uy+7ayym+EsJLJU37VkCQQD6xLRu5r9tKX2/
-NfIQsGxF3TZyXgxcuxMh9JOq5E9nBwhr1JaXDbXktXfIK/F3XWHLFS8CIg6PhgGY
-i/+UtGzvAkEAwpoHp89U2jLdVRoIcwy5o7Ocwk3HCXem3UgFWXzzunGM1x+ozDFA
-uo5nyXiAO6Buka9C2czje275kE18BbqLlQJBAMJNf/EeYdzXdVOfHPzJdlt72CAt
-ty5y1ZRNyc10MgIGdQP4KObJ/NJFuZYkVmjCtm+A7neco+OZVcs5TsOOOYkCQBHQ
-6EKEyM/xODJCX+OolpZWK1PeqwpC2hQIM/Uta2L2Yl6Pl3SaTcLGptnbHmJXHchY
-s1YdW/ZBArgjX+dmXMECQApTKWbVLmNsEoOlHU/I/KhGsfuojrzBMMe3FKLiHpmu
-u86L3vu3OGZFcPgjazxWZcip8JekeJ7c+6suLNNRQ5I=
+MIICXQIBAAKBgQDPf45Cv7vApiN+B6QTura6zUztxJyXRjLc1eljWVm4fA16l60/
+Kd38QE5IzLIbFcSYWaiwsDgj0tiBIicbd2TWQMACQbbbqCVNxqH1A/b6itMctaSp
+TKViGYnj3NisaEeWDzwQGuwAgRCqEz2ZSDquK6y53lsgfAZOV2SvLbOI7wIDAQAB
+AoGACTQ0QDu2/U2hR2bZXVKr5k9S+Tz+YSto+Ci46II/G5LNGkH+Gk4mHZlQn6QM
+xmzJwqQ/ek7mvpgMqHW2XF6IZ3AUmgNqpKdkFMbmkRworAEGRHvJcXy6RhiZI4kv
+UQWc9qEBA6/iR/B0sGsCgTTkv4davCs+5You5+oSyRiRu7kCQQDuQTkSkNm7fwFS
+lrEGmJjzJ3gXMHuv/lL2n2HJV67BBv7Aq7JDdciVLr90chcmXkIwPCywbdWVV9jz
+HWQ6GXKTAkEA3vPm3CKRHMFoSGwiX6qhM2432yLIlpjlfmSj3S6LnhhTJhYS6KMO
+6Ddv4vZ20zl3r4GAaXOyMTtZ6vQlZ8W9tQJBAMvRAAHh6GF9RKRiRQ5ffHiGSzWL
+RERKTK6tqfmUCOsYENbCCr2rBOyaES6Ma0FnYTfiQlirnQslG3Lesd8B5gECQQDS
+FG6PNP8ZYmDaBRJqpIQayxtUoDT0OoPckgYZrvcd8/u9YoVUsfik9T+3U9dpdrgB
+JvyR4NOiMjOrAXyRiLEVAkA9DutrYXzznEAyOvEEtyK92Eb2oTpu1svzRATc/i0w
+UTwLkFi+1m24HJ5MIGyRTHsNj79lj5v5U91lGIINHXXU
 -----END RSA PRIVATE KEY-----
diff --git a/orbsvcs/tests/Security/Callback/server_cert.pem b/orbsvcs/tests/Security/Callback/server_cert.pem
index 0fc394c24d7..5402ae2497a 100644
--- a/orbsvcs/tests/Security/Callback/server_cert.pem
+++ b/orbsvcs/tests/Security/Callback/server_cert.pem
@@ -1,16 +1,59 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 4096 (0x1000)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Tennessee, O=DOC Group
+        Validity
+            Not Before: Jun 15 14:01:15 2011 GMT
+            Not After : May 25 14:01:15 2032 GMT
+        Subject: C=US, ST=Tennessee, O=DOC Group, CN=DOC Group Build Czar Server
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:b2:03:27:b9:d6:24:a4:6d:e1:9f:0e:d7:8a:71:
+                    86:62:df:2b:f8:64:3b:51:53:e0:fa:71:9a:c2:10:
+                    40:97:bd:06:27:43:5a:1a:1c:62:f4:ca:3e:b3:b9:
+                    20:16:89:a2:aa:2e:1e:97:3a:70:3d:fe:f7:ff:ba:
+                    d5:1e:b2:68:07:7e:d0:68:18:8a:3b:aa:9c:01:0e:
+                    1e:ef:b5:97:96:d5:0b:a5:a0:fd:a3:02:21:b5:5a:
+                    6f:e4:c1:36:bf:61:7b:40:ac:73:03:3d:40:75:e7:
+                    9d:ba:22:ab:95:81:8b:74:9e:fa:df:27:18:a7:7f:
+                    23:83:36:f0:15:22:22:db:7b
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                0C:27:05:12:9B:D5:4B:F9:43:32:6B:77:7B:A2:0D:34:7F:6C:0A:BC
+            X509v3 Authority Key Identifier: 
+                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
+
+    Signature Algorithm: sha1WithRSAEncryption
+        0d:bf:65:2a:a5:02:75:6c:c4:5a:3c:1d:3c:25:51:16:1a:f8:
+        78:ad:49:f6:f4:a4:c1:97:e4:c8:0b:ac:9e:71:0e:be:1e:e6:
+        1d:2e:c7:d2:4f:1e:e8:c7:21:7c:58:27:0e:6d:93:11:7e:64:
+        24:57:44:c1:c1:5a:d0:76:82:79:70:82:36:06:f2:48:60:e8:
+        6a:20:a7:92:09:00:73:75:b2:f9:cb:97:35:d6:aa:8e:87:11:
+        20:e2:dd:8a:c3:9c:c4:aa:f0:57:04:4e:e2:b3:8b:fb:9a:4f:
+        4b:60:b7:2e:3b:89:98:38:02:25:24:ff:b1:f1:c0:ad:01:eb:
+        37:bd
 -----BEGIN CERTIFICATE-----
-MIICgzCCAewCAQMwDQYJKoZIhvcNAQEEBQAwgYwxCzAJBgNVBAYTAlVTMQswCQYD
-VQQIEwJDQTEPMA0GA1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAO
-BgNVBAsWB1VDSV9ET0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkB
-FhdwZ29udGxhQGRvYy5lY2UudWNpLmVkdTAeFw0wMTA2MTExNzQ4NTVaFw0xMTA2
-MDkxNzQ4NTVaMIGGMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExDzANBgNVBAcT
-BklydmluZTEMMAoGA1UEChMDT0NJMRAwDgYDVQQLEwdUQU8rT0NJMREwDwYDVQQD
-EwhQcml5YW5rYTEmMCQGCSqGSIb3DQEJARYXcGdvbnRsYUBkb2MuZWNlLnVjaS5l
-ZHUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANKXmudWiLVu/zdBlSr0/dlr
-pRe+Ie26cPyMo5lKiYNY77tABTiOXe5qLUEryjQ/fZ74gmBe4AYFwb7nu/f58X4A
-0tzSg2M4spWM7N4tzf+YbcUipRt9sEISxwfUxNNWTKnLxvCmkzOsISisukdzTkqJ
-fdzEcPfhO2BZKOdmlg1hAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAjUl3ami01tPY
-P1vMp2642dsIKLZis0TmeWp6HNpm52TbiGZOCqDrvtSQ9+2vGz0BkHvGqWKtD+wv
-zJH23fNnqFuzy1C1xtjoeqhXECTsWVTVdoEox8hSWxPiYRE2dioraZQQ5ENDosh+
-V9YcqJJpnKDUOSGVGuyaU7DpR8yK0pc=
+MIICgjCCAeugAwIBAgICEAAwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
+EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
+NTE0MDExNVoXDTMyMDUyNTE0MDExNVowWzELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
+CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMSQwIgYDVQQDExtET0MgR3Jv
+dXAgQnVpbGQgQ3phciBTZXJ2ZXIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
+ALIDJ7nWJKRt4Z8O14pxhmLfK/hkO1FT4PpxmsIQQJe9BidDWhocYvTKPrO5IBaJ
+oqouHpc6cD3+9/+61R6yaAd+0GgYijuqnAEOHu+1l5bVC6Wg/aMCIbVab+TBNr9h
+e0CscwM9QHXnnboiq5WBi3Se+t8nGKd/I4M28BUiItt7AgMBAAGjezB5MAkGA1Ud
+EwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmlj
+YXRlMB0GA1UdDgQWBBQMJwUSm9VL+UMya3d7og00f2wKvDAfBgNVHSMEGDAWgBT9
+c770MzM4GJ+5nGnUEv6BMZUDCjANBgkqhkiG9w0BAQUFAAOBgQANv2UqpQJ1bMRa
+PB08JVEWGvh4rUn29KTBl+TIC6yecQ6+HuYdLsfSTx7oxyF8WCcObZMRfmQkV0TB
+wVrQdoJ5cII2BvJIYOhqIKeSCQBzdbL5y5c11qqOhxEg4t2Kw5zEqvBXBE7is4v7
+mk9LYLcuO4mYOAIlJP+x8cCtAes3vQ==
 -----END CERTIFICATE-----
diff --git a/orbsvcs/tests/Security/Callback/server_key.pem b/orbsvcs/tests/Security/Callback/server_key.pem
index 567a41da6dc..be238899a9f 100644
--- a/orbsvcs/tests/Security/Callback/server_key.pem
+++ b/orbsvcs/tests/Security/Callback/server_key.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDSl5rnVoi1bv83QZUq9P3Za6UXviHtunD8jKOZSomDWO+7QAU4
-jl3uai1BK8o0P32e+IJgXuAGBcG+57v3+fF+ANLc0oNjOLKVjOzeLc3/mG3FIqUb
-fbBCEscH1MTTVkypy8bwppMzrCEorLpHc05KiX3cxHD34TtgWSjnZpYNYQIDAQAB
-AoGAC/TxpZrjLjH8KZ3+oy6/zv1upTd1Y7MHQT+W9lgmEKAXFHGhGkHzEVtT8HRV
-CbxlHIaNmH0qiQ0AoB82K/E0BdIMvE+y2qQwlpMfBMX6/TACORReJN3NXGsXwHP4
-/pNlS4LX7/NZbxlReAlDNP+FO8sdKZTyM3VXHFWJbmm4wsECQQD06zQ4uthp0zI9
-WTZiiAUgYwOcnLnXwfWOLAr8RCnYgwiS7MBCcmhZAgWX5SZJYVCwEJ12DAHy02NJ
-EhiSgo+JAkEA3B7PcS5FqZFi6wVjEG6yF8OuSb/rl+FZfV6utZdCVdMPxacEVxlD
-q7H/dk23O4WwASBriU0PR9/KG3T/LvKBGQJAaYRn1EUTdcxKqcmkt6CYbNKbvL59
-BqqGq4DoHrUTPjd92ybq0fXOZQKM/Fr6OsUVaTVPUYtsz3wpG1MTiRN82QJACX6+
-vggb8yuVU8QAuPW9cu769q1zsTKEVLcf3C9xKhiXppQEyOkLFT3xYh4KGGQ06meG
-m/6Z+SS7KCIM2+6UCQJBANHIzgxDWtrLuWJviNh9EbCsdMioxBH+LGaqFKLC70xD
-Pyoqn+QJQu/ekT+FUb0BeFJfGPzFjh1mFYn4tXxWqMs=
+MIICXgIBAAKBgQCyAye51iSkbeGfDteKcYZi3yv4ZDtRU+D6cZrCEECXvQYnQ1oa
+HGL0yj6zuSAWiaKqLh6XOnA9/vf/utUesmgHftBoGIo7qpwBDh7vtZeW1QuloP2j
+AiG1Wm/kwTa/YXtArHMDPUB15526IquVgYt0nvrfJxinfyODNvAVIiLbewIDAQAB
+AoGAMV1KoPBPjQGjtbYp84xz1etJiEJTaMQ3+XuTjQlwwCN9F1pIHEGO9482QCSw
+T0+vuj274fgktCyGnXY0L6UNz7+0wNhUj5oP2IeJdmgcJbv9tcR126rhryr4bx6H
+2sZdLL4MtxjzRNkURS748zeGET/NuIhpQ4YjnUJ27YOeNtECQQDiItcRkyfMcj+r
+/8JU8h9ifOV5tMOyPV4z6Hfli1X+Xa1OcIieE2nzkaa9LHPEi3+LNw41LItUDbMZ
+/Aztm4VVAkEAyYVbbbebVrgoOF7ueafHZeNToc96FEn04H+tN8AgwaI4+U1Q7oga
+EAjVD++e0NfUUJpeyiygBa9NlzB9XYXdjwJBAJobUCHD/R1Qxp96fn7ROh4uK1xT
+mgG/3JDXXc3qtMHSKScJfbDsXgoFOnI09vf8cQD4lhAauSCg7WtJ362VjLkCQQCu
+eVRoUNAgK78+1wo3sAiWcVRGQyDaEhH+kOxC2YhCvZYAWm1Yp+OQwGTfsEHbZRIA
+Wzb4adx+L4HJBYV1BGKHAkEAvSCAANbm8iaLkCG4EfEyrhIpbJDY2Cx3WO08+ZOz
+ekMspMikGmMQfXXroBpnJ8SGVLYSjf2hQQySwDa00hmyBA==
 -----END RSA PRIVATE KEY-----
diff --git a/orbsvcs/tests/Security/Crash_Test/cacert.pem b/orbsvcs/tests/Security/Crash_Test/cacert.pem
index a9e905f4e6c..d98dd5918cb 100644
--- a/orbsvcs/tests/Security/Crash_Test/cacert.pem
+++ b/orbsvcs/tests/Security/Crash_Test/cacert.pem
@@ -1,21 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIIDfTCCAuagAwIBAgIBADANBgkqhkiG9w0BAQQFADCBjDELMAkGA1UEBhMCVVMx
-CzAJBgNVBAgTAkNBMQ8wDQYDVQQHEwZJcnZpbmUxEjAQBgNVBAoTCURPQyBHcm91
-cDEQMA4GA1UECxYHVUNJX0RPQzERMA8GA1UEAxMIUHJpeWFua2ExJjAkBgkqhkiG
-9w0BCQEWF3Bnb250bGFAZG9jLmVjZS51Y2kuZWR1MB4XDTAxMDYxMTE3MjI0MVoX
-DTExMDYwOTE3MjI0MVowgYwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEPMA0G
-A1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAOBgNVBAsWB1VDSV9E
-T0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkBFhdwZ29udGxhQGRv
-Yy5lY2UudWNpLmVkdTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyFiCRDUH
-nGJqQG9jT/2PhZUAgfwXvIwfDM8m/WujCt/buDcrOz767shBsk4HZhW91Vm4mE03
-K1zfCzojRigf28uyB/rlp60p2Fq0wvZBNNU5Muia6esleR4unb4QslOpcFhct/9n
-UPnlnnsZOTaGWaELNKEjYfHqPh8PQ0lYurECAwEAAaOB7DCB6TAdBgNVHQ4EFgQU
-0Y6IZjkLbLbtZ5aoKLcfd7Yc/kYwgbkGA1UdIwSBsTCBroAU0Y6IZjkLbLbtZ5ao
-KLcfd7Yc/kahgZKkgY8wgYwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEPMA0G
-A1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAOBgNVBAsWB1VDSV9E
-T0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkBFhdwZ29udGxhQGRv
-Yy5lY2UudWNpLmVkdYIBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4GB
-AHYi8ulIzUI3p3+Ma16rumZxvKcmkJJbU6fpAv4ZvK6AWyy+6Ja0GD5N3SGEx+xU
-nMffTR+LePa9PAZiR7dNkF6ikPxXZu4jn8KY2zFT3SB/VjCoEetR9i9QI//O0Fea
-3yZ0NygNWe5cyVDLCb4meucJpsClfyL28DWzMwD2liX3
+MIICgDCCAemgAwIBAgIJAO8E230uBaq+MA0GCSqGSIb3DQEBBQUAMDUxCzAJBgNV
+BAYTAlVTMRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDAe
+Fw0xMTA2MTUxMzU2MDRaFw0yMTA2MTIxMzU2MDRaMDUxCzAJBgNVBAYTAlVTMRIw
+EAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAxzlgJm5rZMTZEQCa7m3/JPbykh4FT7DwcrWBgDRF
+Jk0wgi4K7AKOFdCfOMqbW1Ps5ITbzgwq2yNXOrocKYs//02ewppKx5bxOE5wTA9v
+qwvaoJUeQ8PVEY+RVi2z+CP1xFIVKOCJtrg5WwWE9Vwvu3iyTe95dR1T95Hkrl0I
+yHECAwEAAaOBlzCBlDAdBgNVHQ4EFgQU/XO+9DMzOBifuZxp1BL+gTGVAwowZQYD
+VR0jBF4wXIAU/XO+9DMzOBifuZxp1BL+gTGVAwqhOaQ3MDUxCzAJBgNVBAYTAlVT
+MRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cIIJAO8E230u
+Baq+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAUxxR/7U35mIGJ7c/
+KfZZYze4/Aio7mf9QG0DA55F9DlB16IOJuRXqeMY2Lo+WFo7pszDX8TbucWtWJC6
+pMIVamWLTpgfVrWeTcafio/puqTALKfZ5LHzHieu1QNvFPQxMx1DZ5Eawowhl7ua
+4ERB9b/3K4StZjMUkPmBolSIkPo=
 -----END CERTIFICATE-----
diff --git a/orbsvcs/tests/Security/Crash_Test/client_cert.pem b/orbsvcs/tests/Security/Crash_Test/client_cert.pem
index 0bebb696cfc..b86bd5de1d2 100644
--- a/orbsvcs/tests/Security/Crash_Test/client_cert.pem
+++ b/orbsvcs/tests/Security/Crash_Test/client_cert.pem
@@ -1,16 +1,59 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 4097 (0x1001)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Tennessee, O=DOC Group
+        Validity
+            Not Before: Jun 15 14:01:34 2011 GMT
+            Not After : May 25 14:01:34 2032 GMT
+        Subject: C=US, ST=Tennessee, O=DOC Group, CN=Build Czar Client
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:cf:7f:8e:42:bf:bb:c0:a6:23:7e:07:a4:13:ba:
+                    b6:ba:cd:4c:ed:c4:9c:97:46:32:dc:d5:e9:63:59:
+                    59:b8:7c:0d:7a:97:ad:3f:29:dd:fc:40:4e:48:cc:
+                    b2:1b:15:c4:98:59:a8:b0:b0:38:23:d2:d8:81:22:
+                    27:1b:77:64:d6:40:c0:02:41:b6:db:a8:25:4d:c6:
+                    a1:f5:03:f6:fa:8a:d3:1c:b5:a4:a9:4c:a5:62:19:
+                    89:e3:dc:d8:ac:68:47:96:0f:3c:10:1a:ec:00:81:
+                    10:aa:13:3d:99:48:3a:ae:2b:ac:b9:de:5b:20:7c:
+                    06:4e:57:64:af:2d:b3:88:ef
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                6F:13:BA:8B:91:ED:FA:22:DC:28:26:D4:74:5C:46:A7:B2:B2:A9:10
+            X509v3 Authority Key Identifier: 
+                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
+
+    Signature Algorithm: sha1WithRSAEncryption
+        bc:6f:d5:c7:68:a0:3c:8d:3a:39:61:ff:50:80:c7:a3:b9:28:
+        aa:c8:7b:7e:2d:af:26:e1:0a:39:94:9d:a8:94:c8:cd:82:f5:
+        a5:fc:d1:df:3d:3f:55:c7:5b:f9:89:14:78:59:d6:64:2d:32:
+        42:23:d9:96:9c:50:34:d2:81:17:e3:cc:09:57:13:fc:ae:3b:
+        ed:ff:55:03:d5:c2:dd:a5:5a:f1:c5:66:55:9f:a2:77:74:2f:
+        76:84:93:7c:03:b9:c1:9f:df:41:20:06:57:e4:e2:eb:e7:10:
+        67:42:63:02:d1:a8:53:f1:4d:9b:91:71:37:e4:c2:02:dd:e1:
+        b9:04
 -----BEGIN CERTIFICATE-----
-MIICgzCCAewCAQYwDQYJKoZIhvcNAQEEBQAwgYwxCzAJBgNVBAYTAlVTMQswCQYD
-VQQIEwJDQTEPMA0GA1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAO
-BgNVBAsWB1VDSV9ET0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkB
-FhdwZ29udGxhQGRvYy5lY2UudWNpLmVkdTAeFw0wMTA2MTExODEwMzRaFw0xMTA2
-MDkxODEwMzRaMIGGMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExDzANBgNVBAcT
-BklydmluZTEQMA4GA1UEChMHVEFPK09DSTEMMAoGA1UECxMDT0NJMREwDwYDVQQD
-EwhQcml5YW5rYTEmMCQGCSqGSIb3DQEJARYXcGdvbnRsYUBkb2MuZWNlLnVjaS5l
-ZHUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL6f8pBX7Mi3FPY/OYBOq+kb
-wQ3WX0Z8+nDxd7AiWDAx2AL5EaX8xnUiRi96OJ+CYPCYOUlavGVzZkRVMFdOuHAn
-RvY2sCpvU2rkKpEx9Pd50l7FLnXJuflnRc6zIEKOvuQcPJvsP4AaxaFxTnZExXQJ
-kDEiQP3mGID/eXtUzywbAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAuvSoOnMB6sxj
-ft9YbdLeyATTPzHbxAb6zQo72DUmM3roNowUrefHymU8jZoC6HeaROeKCU0MkVes
-l/jYlz/OwSYkbyGNIUkq4DHEWKzXEg8M603fsWK6IK3T5iPBHY+l/mYSEHJPfypZ
-fl/y4YSNJZlrz6kCIHTcwfHXDRC1mjM=
+MIICeDCCAeGgAwIBAgICEAEwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
+EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
+NTE0MDEzNFoXDTMyMDUyNTE0MDEzNFowUTELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
+CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMRowGAYDVQQDExFCdWlsZCBD
+emFyIENsaWVudDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAz3+OQr+7wKYj
+fgekE7q2us1M7cScl0Yy3NXpY1lZuHwNepetPynd/EBOSMyyGxXEmFmosLA4I9LY
+gSInG3dk1kDAAkG226glTcah9QP2+orTHLWkqUylYhmJ49zYrGhHlg88EBrsAIEQ
+qhM9mUg6riusud5bIHwGTldkry2ziO8CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglg
+hkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0O
+BBYEFG8TuouR7foi3Cgm1HRcRqeysqkQMB8GA1UdIwQYMBaAFP1zvvQzMzgYn7mc
+adQS/oExlQMKMA0GCSqGSIb3DQEBBQUAA4GBALxv1cdooDyNOjlh/1CAx6O5KKrI
+e34trybhCjmUnaiUyM2C9aX80d89P1XHW/mJFHhZ1mQtMkIj2ZacUDTSgRfjzAlX
+E/yuO+3/VQPVwt2lWvHFZlWfond0L3aEk3wDucGf30EgBlfk4uvnEGdCYwLRqFPx
+TZuRcTfkwgLd4bkE
 -----END CERTIFICATE-----
diff --git a/orbsvcs/tests/Security/Crash_Test/client_key.pem b/orbsvcs/tests/Security/Crash_Test/client_key.pem
index 1428b501712..e761037f237 100644
--- a/orbsvcs/tests/Security/Crash_Test/client_key.pem
+++ b/orbsvcs/tests/Security/Crash_Test/client_key.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQC+n/KQV+zItxT2PzmATqvpG8EN1l9GfPpw8XewIlgwMdgC+RGl
-/MZ1IkYvejifgmDwmDlJWrxlc2ZEVTBXTrhwJ0b2NrAqb1Nq5CqRMfT3edJexS51
-ybn5Z0XOsyBCjr7kHDyb7D+AGsWhcU52RMV0CZAxIkD95hiA/3l7VM8sGwIDAQAB
-AoGABGaa6fwtqkCXykuRX0XxsBME9PXTA0SVX5AjjDxuvsYXz5HCd4uLZV7iMexn
-bD9NT6CkCe5/VPRCEyfIUuutVFc7lkPwuRw5FvNcf4gMH9ltufQfH/KeR7d2Jvge
-zrTOH7nicshy67mfOEOaoDphWoT9uy+7ayym+EsJLJU37VkCQQD6xLRu5r9tKX2/
-NfIQsGxF3TZyXgxcuxMh9JOq5E9nBwhr1JaXDbXktXfIK/F3XWHLFS8CIg6PhgGY
-i/+UtGzvAkEAwpoHp89U2jLdVRoIcwy5o7Ocwk3HCXem3UgFWXzzunGM1x+ozDFA
-uo5nyXiAO6Buka9C2czje275kE18BbqLlQJBAMJNf/EeYdzXdVOfHPzJdlt72CAt
-ty5y1ZRNyc10MgIGdQP4KObJ/NJFuZYkVmjCtm+A7neco+OZVcs5TsOOOYkCQBHQ
-6EKEyM/xODJCX+OolpZWK1PeqwpC2hQIM/Uta2L2Yl6Pl3SaTcLGptnbHmJXHchY
-s1YdW/ZBArgjX+dmXMECQApTKWbVLmNsEoOlHU/I/KhGsfuojrzBMMe3FKLiHpmu
-u86L3vu3OGZFcPgjazxWZcip8JekeJ7c+6suLNNRQ5I=
+MIICXQIBAAKBgQDPf45Cv7vApiN+B6QTura6zUztxJyXRjLc1eljWVm4fA16l60/
+Kd38QE5IzLIbFcSYWaiwsDgj0tiBIicbd2TWQMACQbbbqCVNxqH1A/b6itMctaSp
+TKViGYnj3NisaEeWDzwQGuwAgRCqEz2ZSDquK6y53lsgfAZOV2SvLbOI7wIDAQAB
+AoGACTQ0QDu2/U2hR2bZXVKr5k9S+Tz+YSto+Ci46II/G5LNGkH+Gk4mHZlQn6QM
+xmzJwqQ/ek7mvpgMqHW2XF6IZ3AUmgNqpKdkFMbmkRworAEGRHvJcXy6RhiZI4kv
+UQWc9qEBA6/iR/B0sGsCgTTkv4davCs+5You5+oSyRiRu7kCQQDuQTkSkNm7fwFS
+lrEGmJjzJ3gXMHuv/lL2n2HJV67BBv7Aq7JDdciVLr90chcmXkIwPCywbdWVV9jz
+HWQ6GXKTAkEA3vPm3CKRHMFoSGwiX6qhM2432yLIlpjlfmSj3S6LnhhTJhYS6KMO
+6Ddv4vZ20zl3r4GAaXOyMTtZ6vQlZ8W9tQJBAMvRAAHh6GF9RKRiRQ5ffHiGSzWL
+RERKTK6tqfmUCOsYENbCCr2rBOyaES6Ma0FnYTfiQlirnQslG3Lesd8B5gECQQDS
+FG6PNP8ZYmDaBRJqpIQayxtUoDT0OoPckgYZrvcd8/u9YoVUsfik9T+3U9dpdrgB
+JvyR4NOiMjOrAXyRiLEVAkA9DutrYXzznEAyOvEEtyK92Eb2oTpu1svzRATc/i0w
+UTwLkFi+1m24HJ5MIGyRTHsNj79lj5v5U91lGIINHXXU
 -----END RSA PRIVATE KEY-----
diff --git a/orbsvcs/tests/Security/Crash_Test/server_cert.pem b/orbsvcs/tests/Security/Crash_Test/server_cert.pem
index 0fc394c24d7..5402ae2497a 100644
--- a/orbsvcs/tests/Security/Crash_Test/server_cert.pem
+++ b/orbsvcs/tests/Security/Crash_Test/server_cert.pem
@@ -1,16 +1,59 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 4096 (0x1000)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Tennessee, O=DOC Group
+        Validity
+            Not Before: Jun 15 14:01:15 2011 GMT
+            Not After : May 25 14:01:15 2032 GMT
+        Subject: C=US, ST=Tennessee, O=DOC Group, CN=DOC Group Build Czar Server
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:b2:03:27:b9:d6:24:a4:6d:e1:9f:0e:d7:8a:71:
+                    86:62:df:2b:f8:64:3b:51:53:e0:fa:71:9a:c2:10:
+                    40:97:bd:06:27:43:5a:1a:1c:62:f4:ca:3e:b3:b9:
+                    20:16:89:a2:aa:2e:1e:97:3a:70:3d:fe:f7:ff:ba:
+                    d5:1e:b2:68:07:7e:d0:68:18:8a:3b:aa:9c:01:0e:
+                    1e:ef:b5:97:96:d5:0b:a5:a0:fd:a3:02:21:b5:5a:
+                    6f:e4:c1:36:bf:61:7b:40:ac:73:03:3d:40:75:e7:
+                    9d:ba:22:ab:95:81:8b:74:9e:fa:df:27:18:a7:7f:
+                    23:83:36:f0:15:22:22:db:7b
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                0C:27:05:12:9B:D5:4B:F9:43:32:6B:77:7B:A2:0D:34:7F:6C:0A:BC
+            X509v3 Authority Key Identifier: 
+                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
+
+    Signature Algorithm: sha1WithRSAEncryption
+        0d:bf:65:2a:a5:02:75:6c:c4:5a:3c:1d:3c:25:51:16:1a:f8:
+        78:ad:49:f6:f4:a4:c1:97:e4:c8:0b:ac:9e:71:0e:be:1e:e6:
+        1d:2e:c7:d2:4f:1e:e8:c7:21:7c:58:27:0e:6d:93:11:7e:64:
+        24:57:44:c1:c1:5a:d0:76:82:79:70:82:36:06:f2:48:60:e8:
+        6a:20:a7:92:09:00:73:75:b2:f9:cb:97:35:d6:aa:8e:87:11:
+        20:e2:dd:8a:c3:9c:c4:aa:f0:57:04:4e:e2:b3:8b:fb:9a:4f:
+        4b:60:b7:2e:3b:89:98:38:02:25:24:ff:b1:f1:c0:ad:01:eb:
+        37:bd
 -----BEGIN CERTIFICATE-----
-MIICgzCCAewCAQMwDQYJKoZIhvcNAQEEBQAwgYwxCzAJBgNVBAYTAlVTMQswCQYD
-VQQIEwJDQTEPMA0GA1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAO
-BgNVBAsWB1VDSV9ET0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkB
-FhdwZ29udGxhQGRvYy5lY2UudWNpLmVkdTAeFw0wMTA2MTExNzQ4NTVaFw0xMTA2
-MDkxNzQ4NTVaMIGGMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExDzANBgNVBAcT
-BklydmluZTEMMAoGA1UEChMDT0NJMRAwDgYDVQQLEwdUQU8rT0NJMREwDwYDVQQD
-EwhQcml5YW5rYTEmMCQGCSqGSIb3DQEJARYXcGdvbnRsYUBkb2MuZWNlLnVjaS5l
-ZHUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANKXmudWiLVu/zdBlSr0/dlr
-pRe+Ie26cPyMo5lKiYNY77tABTiOXe5qLUEryjQ/fZ74gmBe4AYFwb7nu/f58X4A
-0tzSg2M4spWM7N4tzf+YbcUipRt9sEISxwfUxNNWTKnLxvCmkzOsISisukdzTkqJ
-fdzEcPfhO2BZKOdmlg1hAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAjUl3ami01tPY
-P1vMp2642dsIKLZis0TmeWp6HNpm52TbiGZOCqDrvtSQ9+2vGz0BkHvGqWKtD+wv
-zJH23fNnqFuzy1C1xtjoeqhXECTsWVTVdoEox8hSWxPiYRE2dioraZQQ5ENDosh+
-V9YcqJJpnKDUOSGVGuyaU7DpR8yK0pc=
+MIICgjCCAeugAwIBAgICEAAwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
+EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
+NTE0MDExNVoXDTMyMDUyNTE0MDExNVowWzELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
+CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMSQwIgYDVQQDExtET0MgR3Jv
+dXAgQnVpbGQgQ3phciBTZXJ2ZXIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
+ALIDJ7nWJKRt4Z8O14pxhmLfK/hkO1FT4PpxmsIQQJe9BidDWhocYvTKPrO5IBaJ
+oqouHpc6cD3+9/+61R6yaAd+0GgYijuqnAEOHu+1l5bVC6Wg/aMCIbVab+TBNr9h
+e0CscwM9QHXnnboiq5WBi3Se+t8nGKd/I4M28BUiItt7AgMBAAGjezB5MAkGA1Ud
+EwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmlj
+YXRlMB0GA1UdDgQWBBQMJwUSm9VL+UMya3d7og00f2wKvDAfBgNVHSMEGDAWgBT9
+c770MzM4GJ+5nGnUEv6BMZUDCjANBgkqhkiG9w0BAQUFAAOBgQANv2UqpQJ1bMRa
+PB08JVEWGvh4rUn29KTBl+TIC6yecQ6+HuYdLsfSTx7oxyF8WCcObZMRfmQkV0TB
+wVrQdoJ5cII2BvJIYOhqIKeSCQBzdbL5y5c11qqOhxEg4t2Kw5zEqvBXBE7is4v7
+mk9LYLcuO4mYOAIlJP+x8cCtAes3vQ==
 -----END CERTIFICATE-----
diff --git a/orbsvcs/tests/Security/Crash_Test/server_key.pem b/orbsvcs/tests/Security/Crash_Test/server_key.pem
index 567a41da6dc..be238899a9f 100644
--- a/orbsvcs/tests/Security/Crash_Test/server_key.pem
+++ b/orbsvcs/tests/Security/Crash_Test/server_key.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDSl5rnVoi1bv83QZUq9P3Za6UXviHtunD8jKOZSomDWO+7QAU4
-jl3uai1BK8o0P32e+IJgXuAGBcG+57v3+fF+ANLc0oNjOLKVjOzeLc3/mG3FIqUb
-fbBCEscH1MTTVkypy8bwppMzrCEorLpHc05KiX3cxHD34TtgWSjnZpYNYQIDAQAB
-AoGAC/TxpZrjLjH8KZ3+oy6/zv1upTd1Y7MHQT+W9lgmEKAXFHGhGkHzEVtT8HRV
-CbxlHIaNmH0qiQ0AoB82K/E0BdIMvE+y2qQwlpMfBMX6/TACORReJN3NXGsXwHP4
-/pNlS4LX7/NZbxlReAlDNP+FO8sdKZTyM3VXHFWJbmm4wsECQQD06zQ4uthp0zI9
-WTZiiAUgYwOcnLnXwfWOLAr8RCnYgwiS7MBCcmhZAgWX5SZJYVCwEJ12DAHy02NJ
-EhiSgo+JAkEA3B7PcS5FqZFi6wVjEG6yF8OuSb/rl+FZfV6utZdCVdMPxacEVxlD
-q7H/dk23O4WwASBriU0PR9/KG3T/LvKBGQJAaYRn1EUTdcxKqcmkt6CYbNKbvL59
-BqqGq4DoHrUTPjd92ybq0fXOZQKM/Fr6OsUVaTVPUYtsz3wpG1MTiRN82QJACX6+
-vggb8yuVU8QAuPW9cu769q1zsTKEVLcf3C9xKhiXppQEyOkLFT3xYh4KGGQ06meG
-m/6Z+SS7KCIM2+6UCQJBANHIzgxDWtrLuWJviNh9EbCsdMioxBH+LGaqFKLC70xD
-Pyoqn+QJQu/ekT+FUb0BeFJfGPzFjh1mFYn4tXxWqMs=
+MIICXgIBAAKBgQCyAye51iSkbeGfDteKcYZi3yv4ZDtRU+D6cZrCEECXvQYnQ1oa
+HGL0yj6zuSAWiaKqLh6XOnA9/vf/utUesmgHftBoGIo7qpwBDh7vtZeW1QuloP2j
+AiG1Wm/kwTa/YXtArHMDPUB15526IquVgYt0nvrfJxinfyODNvAVIiLbewIDAQAB
+AoGAMV1KoPBPjQGjtbYp84xz1etJiEJTaMQ3+XuTjQlwwCN9F1pIHEGO9482QCSw
+T0+vuj274fgktCyGnXY0L6UNz7+0wNhUj5oP2IeJdmgcJbv9tcR126rhryr4bx6H
+2sZdLL4MtxjzRNkURS748zeGET/NuIhpQ4YjnUJ27YOeNtECQQDiItcRkyfMcj+r
+/8JU8h9ifOV5tMOyPV4z6Hfli1X+Xa1OcIieE2nzkaa9LHPEi3+LNw41LItUDbMZ
+/Aztm4VVAkEAyYVbbbebVrgoOF7ueafHZeNToc96FEn04H+tN8AgwaI4+U1Q7oga
+EAjVD++e0NfUUJpeyiygBa9NlzB9XYXdjwJBAJobUCHD/R1Qxp96fn7ROh4uK1xT
+mgG/3JDXXc3qtMHSKScJfbDsXgoFOnI09vf8cQD4lhAauSCg7WtJ362VjLkCQQCu
+eVRoUNAgK78+1wo3sAiWcVRGQyDaEhH+kOxC2YhCvZYAWm1Yp+OQwGTfsEHbZRIA
+Wzb4adx+L4HJBYV1BGKHAkEAvSCAANbm8iaLkCG4EfEyrhIpbJDY2Cx3WO08+ZOz
+ekMspMikGmMQfXXroBpnJ8SGVLYSjf2hQQySwDa00hmyBA==
 -----END RSA PRIVATE KEY-----
diff --git a/orbsvcs/tests/Security/Null_Cipher/cacert.pem b/orbsvcs/tests/Security/Null_Cipher/cacert.pem
index a9e905f4e6c..d98dd5918cb 100644
--- a/orbsvcs/tests/Security/Null_Cipher/cacert.pem
+++ b/orbsvcs/tests/Security/Null_Cipher/cacert.pem
@@ -1,21 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIIDfTCCAuagAwIBAgIBADANBgkqhkiG9w0BAQQFADCBjDELMAkGA1UEBhMCVVMx
-CzAJBgNVBAgTAkNBMQ8wDQYDVQQHEwZJcnZpbmUxEjAQBgNVBAoTCURPQyBHcm91
-cDEQMA4GA1UECxYHVUNJX0RPQzERMA8GA1UEAxMIUHJpeWFua2ExJjAkBgkqhkiG
-9w0BCQEWF3Bnb250bGFAZG9jLmVjZS51Y2kuZWR1MB4XDTAxMDYxMTE3MjI0MVoX
-DTExMDYwOTE3MjI0MVowgYwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEPMA0G
-A1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAOBgNVBAsWB1VDSV9E
-T0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkBFhdwZ29udGxhQGRv
-Yy5lY2UudWNpLmVkdTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyFiCRDUH
-nGJqQG9jT/2PhZUAgfwXvIwfDM8m/WujCt/buDcrOz767shBsk4HZhW91Vm4mE03
-K1zfCzojRigf28uyB/rlp60p2Fq0wvZBNNU5Muia6esleR4unb4QslOpcFhct/9n
-UPnlnnsZOTaGWaELNKEjYfHqPh8PQ0lYurECAwEAAaOB7DCB6TAdBgNVHQ4EFgQU
-0Y6IZjkLbLbtZ5aoKLcfd7Yc/kYwgbkGA1UdIwSBsTCBroAU0Y6IZjkLbLbtZ5ao
-KLcfd7Yc/kahgZKkgY8wgYwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEPMA0G
-A1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAOBgNVBAsWB1VDSV9E
-T0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkBFhdwZ29udGxhQGRv
-Yy5lY2UudWNpLmVkdYIBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4GB
-AHYi8ulIzUI3p3+Ma16rumZxvKcmkJJbU6fpAv4ZvK6AWyy+6Ja0GD5N3SGEx+xU
-nMffTR+LePa9PAZiR7dNkF6ikPxXZu4jn8KY2zFT3SB/VjCoEetR9i9QI//O0Fea
-3yZ0NygNWe5cyVDLCb4meucJpsClfyL28DWzMwD2liX3
+MIICgDCCAemgAwIBAgIJAO8E230uBaq+MA0GCSqGSIb3DQEBBQUAMDUxCzAJBgNV
+BAYTAlVTMRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDAe
+Fw0xMTA2MTUxMzU2MDRaFw0yMTA2MTIxMzU2MDRaMDUxCzAJBgNVBAYTAlVTMRIw
+EAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAxzlgJm5rZMTZEQCa7m3/JPbykh4FT7DwcrWBgDRF
+Jk0wgi4K7AKOFdCfOMqbW1Ps5ITbzgwq2yNXOrocKYs//02ewppKx5bxOE5wTA9v
+qwvaoJUeQ8PVEY+RVi2z+CP1xFIVKOCJtrg5WwWE9Vwvu3iyTe95dR1T95Hkrl0I
+yHECAwEAAaOBlzCBlDAdBgNVHQ4EFgQU/XO+9DMzOBifuZxp1BL+gTGVAwowZQYD
+VR0jBF4wXIAU/XO+9DMzOBifuZxp1BL+gTGVAwqhOaQ3MDUxCzAJBgNVBAYTAlVT
+MRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cIIJAO8E230u
+Baq+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAUxxR/7U35mIGJ7c/
+KfZZYze4/Aio7mf9QG0DA55F9DlB16IOJuRXqeMY2Lo+WFo7pszDX8TbucWtWJC6
+pMIVamWLTpgfVrWeTcafio/puqTALKfZ5LHzHieu1QNvFPQxMx1DZ5Eawowhl7ua
+4ERB9b/3K4StZjMUkPmBolSIkPo=
 -----END CERTIFICATE-----
diff --git a/orbsvcs/tests/Security/Null_Cipher/client_cert.pem b/orbsvcs/tests/Security/Null_Cipher/client_cert.pem
index 0bebb696cfc..b86bd5de1d2 100644
--- a/orbsvcs/tests/Security/Null_Cipher/client_cert.pem
+++ b/orbsvcs/tests/Security/Null_Cipher/client_cert.pem
@@ -1,16 +1,59 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 4097 (0x1001)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Tennessee, O=DOC Group
+        Validity
+            Not Before: Jun 15 14:01:34 2011 GMT
+            Not After : May 25 14:01:34 2032 GMT
+        Subject: C=US, ST=Tennessee, O=DOC Group, CN=Build Czar Client
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:cf:7f:8e:42:bf:bb:c0:a6:23:7e:07:a4:13:ba:
+                    b6:ba:cd:4c:ed:c4:9c:97:46:32:dc:d5:e9:63:59:
+                    59:b8:7c:0d:7a:97:ad:3f:29:dd:fc:40:4e:48:cc:
+                    b2:1b:15:c4:98:59:a8:b0:b0:38:23:d2:d8:81:22:
+                    27:1b:77:64:d6:40:c0:02:41:b6:db:a8:25:4d:c6:
+                    a1:f5:03:f6:fa:8a:d3:1c:b5:a4:a9:4c:a5:62:19:
+                    89:e3:dc:d8:ac:68:47:96:0f:3c:10:1a:ec:00:81:
+                    10:aa:13:3d:99:48:3a:ae:2b:ac:b9:de:5b:20:7c:
+                    06:4e:57:64:af:2d:b3:88:ef
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                6F:13:BA:8B:91:ED:FA:22:DC:28:26:D4:74:5C:46:A7:B2:B2:A9:10
+            X509v3 Authority Key Identifier: 
+                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
+
+    Signature Algorithm: sha1WithRSAEncryption
+        bc:6f:d5:c7:68:a0:3c:8d:3a:39:61:ff:50:80:c7:a3:b9:28:
+        aa:c8:7b:7e:2d:af:26:e1:0a:39:94:9d:a8:94:c8:cd:82:f5:
+        a5:fc:d1:df:3d:3f:55:c7:5b:f9:89:14:78:59:d6:64:2d:32:
+        42:23:d9:96:9c:50:34:d2:81:17:e3:cc:09:57:13:fc:ae:3b:
+        ed:ff:55:03:d5:c2:dd:a5:5a:f1:c5:66:55:9f:a2:77:74:2f:
+        76:84:93:7c:03:b9:c1:9f:df:41:20:06:57:e4:e2:eb:e7:10:
+        67:42:63:02:d1:a8:53:f1:4d:9b:91:71:37:e4:c2:02:dd:e1:
+        b9:04
 -----BEGIN CERTIFICATE-----
-MIICgzCCAewCAQYwDQYJKoZIhvcNAQEEBQAwgYwxCzAJBgNVBAYTAlVTMQswCQYD
-VQQIEwJDQTEPMA0GA1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAO
-BgNVBAsWB1VDSV9ET0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkB
-FhdwZ29udGxhQGRvYy5lY2UudWNpLmVkdTAeFw0wMTA2MTExODEwMzRaFw0xMTA2
-MDkxODEwMzRaMIGGMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExDzANBgNVBAcT
-BklydmluZTEQMA4GA1UEChMHVEFPK09DSTEMMAoGA1UECxMDT0NJMREwDwYDVQQD
-EwhQcml5YW5rYTEmMCQGCSqGSIb3DQEJARYXcGdvbnRsYUBkb2MuZWNlLnVjaS5l
-ZHUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL6f8pBX7Mi3FPY/OYBOq+kb
-wQ3WX0Z8+nDxd7AiWDAx2AL5EaX8xnUiRi96OJ+CYPCYOUlavGVzZkRVMFdOuHAn
-RvY2sCpvU2rkKpEx9Pd50l7FLnXJuflnRc6zIEKOvuQcPJvsP4AaxaFxTnZExXQJ
-kDEiQP3mGID/eXtUzywbAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAuvSoOnMB6sxj
-ft9YbdLeyATTPzHbxAb6zQo72DUmM3roNowUrefHymU8jZoC6HeaROeKCU0MkVes
-l/jYlz/OwSYkbyGNIUkq4DHEWKzXEg8M603fsWK6IK3T5iPBHY+l/mYSEHJPfypZ
-fl/y4YSNJZlrz6kCIHTcwfHXDRC1mjM=
+MIICeDCCAeGgAwIBAgICEAEwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
+EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
+NTE0MDEzNFoXDTMyMDUyNTE0MDEzNFowUTELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
+CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMRowGAYDVQQDExFCdWlsZCBD
+emFyIENsaWVudDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAz3+OQr+7wKYj
+fgekE7q2us1M7cScl0Yy3NXpY1lZuHwNepetPynd/EBOSMyyGxXEmFmosLA4I9LY
+gSInG3dk1kDAAkG226glTcah9QP2+orTHLWkqUylYhmJ49zYrGhHlg88EBrsAIEQ
+qhM9mUg6riusud5bIHwGTldkry2ziO8CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglg
+hkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0O
+BBYEFG8TuouR7foi3Cgm1HRcRqeysqkQMB8GA1UdIwQYMBaAFP1zvvQzMzgYn7mc
+adQS/oExlQMKMA0GCSqGSIb3DQEBBQUAA4GBALxv1cdooDyNOjlh/1CAx6O5KKrI
+e34trybhCjmUnaiUyM2C9aX80d89P1XHW/mJFHhZ1mQtMkIj2ZacUDTSgRfjzAlX
+E/yuO+3/VQPVwt2lWvHFZlWfond0L3aEk3wDucGf30EgBlfk4uvnEGdCYwLRqFPx
+TZuRcTfkwgLd4bkE
 -----END CERTIFICATE-----
diff --git a/orbsvcs/tests/Security/Null_Cipher/client_key.pem b/orbsvcs/tests/Security/Null_Cipher/client_key.pem
index 1428b501712..e761037f237 100644
--- a/orbsvcs/tests/Security/Null_Cipher/client_key.pem
+++ b/orbsvcs/tests/Security/Null_Cipher/client_key.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQC+n/KQV+zItxT2PzmATqvpG8EN1l9GfPpw8XewIlgwMdgC+RGl
-/MZ1IkYvejifgmDwmDlJWrxlc2ZEVTBXTrhwJ0b2NrAqb1Nq5CqRMfT3edJexS51
-ybn5Z0XOsyBCjr7kHDyb7D+AGsWhcU52RMV0CZAxIkD95hiA/3l7VM8sGwIDAQAB
-AoGABGaa6fwtqkCXykuRX0XxsBME9PXTA0SVX5AjjDxuvsYXz5HCd4uLZV7iMexn
-bD9NT6CkCe5/VPRCEyfIUuutVFc7lkPwuRw5FvNcf4gMH9ltufQfH/KeR7d2Jvge
-zrTOH7nicshy67mfOEOaoDphWoT9uy+7ayym+EsJLJU37VkCQQD6xLRu5r9tKX2/
-NfIQsGxF3TZyXgxcuxMh9JOq5E9nBwhr1JaXDbXktXfIK/F3XWHLFS8CIg6PhgGY
-i/+UtGzvAkEAwpoHp89U2jLdVRoIcwy5o7Ocwk3HCXem3UgFWXzzunGM1x+ozDFA
-uo5nyXiAO6Buka9C2czje275kE18BbqLlQJBAMJNf/EeYdzXdVOfHPzJdlt72CAt
-ty5y1ZRNyc10MgIGdQP4KObJ/NJFuZYkVmjCtm+A7neco+OZVcs5TsOOOYkCQBHQ
-6EKEyM/xODJCX+OolpZWK1PeqwpC2hQIM/Uta2L2Yl6Pl3SaTcLGptnbHmJXHchY
-s1YdW/ZBArgjX+dmXMECQApTKWbVLmNsEoOlHU/I/KhGsfuojrzBMMe3FKLiHpmu
-u86L3vu3OGZFcPgjazxWZcip8JekeJ7c+6suLNNRQ5I=
+MIICXQIBAAKBgQDPf45Cv7vApiN+B6QTura6zUztxJyXRjLc1eljWVm4fA16l60/
+Kd38QE5IzLIbFcSYWaiwsDgj0tiBIicbd2TWQMACQbbbqCVNxqH1A/b6itMctaSp
+TKViGYnj3NisaEeWDzwQGuwAgRCqEz2ZSDquK6y53lsgfAZOV2SvLbOI7wIDAQAB
+AoGACTQ0QDu2/U2hR2bZXVKr5k9S+Tz+YSto+Ci46II/G5LNGkH+Gk4mHZlQn6QM
+xmzJwqQ/ek7mvpgMqHW2XF6IZ3AUmgNqpKdkFMbmkRworAEGRHvJcXy6RhiZI4kv
+UQWc9qEBA6/iR/B0sGsCgTTkv4davCs+5You5+oSyRiRu7kCQQDuQTkSkNm7fwFS
+lrEGmJjzJ3gXMHuv/lL2n2HJV67BBv7Aq7JDdciVLr90chcmXkIwPCywbdWVV9jz
+HWQ6GXKTAkEA3vPm3CKRHMFoSGwiX6qhM2432yLIlpjlfmSj3S6LnhhTJhYS6KMO
+6Ddv4vZ20zl3r4GAaXOyMTtZ6vQlZ8W9tQJBAMvRAAHh6GF9RKRiRQ5ffHiGSzWL
+RERKTK6tqfmUCOsYENbCCr2rBOyaES6Ma0FnYTfiQlirnQslG3Lesd8B5gECQQDS
+FG6PNP8ZYmDaBRJqpIQayxtUoDT0OoPckgYZrvcd8/u9YoVUsfik9T+3U9dpdrgB
+JvyR4NOiMjOrAXyRiLEVAkA9DutrYXzznEAyOvEEtyK92Eb2oTpu1svzRATc/i0w
+UTwLkFi+1m24HJ5MIGyRTHsNj79lj5v5U91lGIINHXXU
 -----END RSA PRIVATE KEY-----
diff --git a/orbsvcs/tests/Security/Null_Cipher/server_cert.pem b/orbsvcs/tests/Security/Null_Cipher/server_cert.pem
index 0fc394c24d7..5402ae2497a 100644
--- a/orbsvcs/tests/Security/Null_Cipher/server_cert.pem
+++ b/orbsvcs/tests/Security/Null_Cipher/server_cert.pem
@@ -1,16 +1,59 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 4096 (0x1000)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Tennessee, O=DOC Group
+        Validity
+            Not Before: Jun 15 14:01:15 2011 GMT
+            Not After : May 25 14:01:15 2032 GMT
+        Subject: C=US, ST=Tennessee, O=DOC Group, CN=DOC Group Build Czar Server
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:b2:03:27:b9:d6:24:a4:6d:e1:9f:0e:d7:8a:71:
+                    86:62:df:2b:f8:64:3b:51:53:e0:fa:71:9a:c2:10:
+                    40:97:bd:06:27:43:5a:1a:1c:62:f4:ca:3e:b3:b9:
+                    20:16:89:a2:aa:2e:1e:97:3a:70:3d:fe:f7:ff:ba:
+                    d5:1e:b2:68:07:7e:d0:68:18:8a:3b:aa:9c:01:0e:
+                    1e:ef:b5:97:96:d5:0b:a5:a0:fd:a3:02:21:b5:5a:
+                    6f:e4:c1:36:bf:61:7b:40:ac:73:03:3d:40:75:e7:
+                    9d:ba:22:ab:95:81:8b:74:9e:fa:df:27:18:a7:7f:
+                    23:83:36:f0:15:22:22:db:7b
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                0C:27:05:12:9B:D5:4B:F9:43:32:6B:77:7B:A2:0D:34:7F:6C:0A:BC
+            X509v3 Authority Key Identifier: 
+                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
+
+    Signature Algorithm: sha1WithRSAEncryption
+        0d:bf:65:2a:a5:02:75:6c:c4:5a:3c:1d:3c:25:51:16:1a:f8:
+        78:ad:49:f6:f4:a4:c1:97:e4:c8:0b:ac:9e:71:0e:be:1e:e6:
+        1d:2e:c7:d2:4f:1e:e8:c7:21:7c:58:27:0e:6d:93:11:7e:64:
+        24:57:44:c1:c1:5a:d0:76:82:79:70:82:36:06:f2:48:60:e8:
+        6a:20:a7:92:09:00:73:75:b2:f9:cb:97:35:d6:aa:8e:87:11:
+        20:e2:dd:8a:c3:9c:c4:aa:f0:57:04:4e:e2:b3:8b:fb:9a:4f:
+        4b:60:b7:2e:3b:89:98:38:02:25:24:ff:b1:f1:c0:ad:01:eb:
+        37:bd
 -----BEGIN CERTIFICATE-----
-MIICgzCCAewCAQMwDQYJKoZIhvcNAQEEBQAwgYwxCzAJBgNVBAYTAlVTMQswCQYD
-VQQIEwJDQTEPMA0GA1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAO
-BgNVBAsWB1VDSV9ET0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkB
-FhdwZ29udGxhQGRvYy5lY2UudWNpLmVkdTAeFw0wMTA2MTExNzQ4NTVaFw0xMTA2
-MDkxNzQ4NTVaMIGGMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExDzANBgNVBAcT
-BklydmluZTEMMAoGA1UEChMDT0NJMRAwDgYDVQQLEwdUQU8rT0NJMREwDwYDVQQD
-EwhQcml5YW5rYTEmMCQGCSqGSIb3DQEJARYXcGdvbnRsYUBkb2MuZWNlLnVjaS5l
-ZHUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANKXmudWiLVu/zdBlSr0/dlr
-pRe+Ie26cPyMo5lKiYNY77tABTiOXe5qLUEryjQ/fZ74gmBe4AYFwb7nu/f58X4A
-0tzSg2M4spWM7N4tzf+YbcUipRt9sEISxwfUxNNWTKnLxvCmkzOsISisukdzTkqJ
-fdzEcPfhO2BZKOdmlg1hAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAjUl3ami01tPY
-P1vMp2642dsIKLZis0TmeWp6HNpm52TbiGZOCqDrvtSQ9+2vGz0BkHvGqWKtD+wv
-zJH23fNnqFuzy1C1xtjoeqhXECTsWVTVdoEox8hSWxPiYRE2dioraZQQ5ENDosh+
-V9YcqJJpnKDUOSGVGuyaU7DpR8yK0pc=
+MIICgjCCAeugAwIBAgICEAAwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
+EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
+NTE0MDExNVoXDTMyMDUyNTE0MDExNVowWzELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
+CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMSQwIgYDVQQDExtET0MgR3Jv
+dXAgQnVpbGQgQ3phciBTZXJ2ZXIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
+ALIDJ7nWJKRt4Z8O14pxhmLfK/hkO1FT4PpxmsIQQJe9BidDWhocYvTKPrO5IBaJ
+oqouHpc6cD3+9/+61R6yaAd+0GgYijuqnAEOHu+1l5bVC6Wg/aMCIbVab+TBNr9h
+e0CscwM9QHXnnboiq5WBi3Se+t8nGKd/I4M28BUiItt7AgMBAAGjezB5MAkGA1Ud
+EwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmlj
+YXRlMB0GA1UdDgQWBBQMJwUSm9VL+UMya3d7og00f2wKvDAfBgNVHSMEGDAWgBT9
+c770MzM4GJ+5nGnUEv6BMZUDCjANBgkqhkiG9w0BAQUFAAOBgQANv2UqpQJ1bMRa
+PB08JVEWGvh4rUn29KTBl+TIC6yecQ6+HuYdLsfSTx7oxyF8WCcObZMRfmQkV0TB
+wVrQdoJ5cII2BvJIYOhqIKeSCQBzdbL5y5c11qqOhxEg4t2Kw5zEqvBXBE7is4v7
+mk9LYLcuO4mYOAIlJP+x8cCtAes3vQ==
 -----END CERTIFICATE-----
diff --git a/orbsvcs/tests/Security/Null_Cipher/server_key.pem b/orbsvcs/tests/Security/Null_Cipher/server_key.pem
index 567a41da6dc..be238899a9f 100644
--- a/orbsvcs/tests/Security/Null_Cipher/server_key.pem
+++ b/orbsvcs/tests/Security/Null_Cipher/server_key.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDSl5rnVoi1bv83QZUq9P3Za6UXviHtunD8jKOZSomDWO+7QAU4
-jl3uai1BK8o0P32e+IJgXuAGBcG+57v3+fF+ANLc0oNjOLKVjOzeLc3/mG3FIqUb
-fbBCEscH1MTTVkypy8bwppMzrCEorLpHc05KiX3cxHD34TtgWSjnZpYNYQIDAQAB
-AoGAC/TxpZrjLjH8KZ3+oy6/zv1upTd1Y7MHQT+W9lgmEKAXFHGhGkHzEVtT8HRV
-CbxlHIaNmH0qiQ0AoB82K/E0BdIMvE+y2qQwlpMfBMX6/TACORReJN3NXGsXwHP4
-/pNlS4LX7/NZbxlReAlDNP+FO8sdKZTyM3VXHFWJbmm4wsECQQD06zQ4uthp0zI9
-WTZiiAUgYwOcnLnXwfWOLAr8RCnYgwiS7MBCcmhZAgWX5SZJYVCwEJ12DAHy02NJ
-EhiSgo+JAkEA3B7PcS5FqZFi6wVjEG6yF8OuSb/rl+FZfV6utZdCVdMPxacEVxlD
-q7H/dk23O4WwASBriU0PR9/KG3T/LvKBGQJAaYRn1EUTdcxKqcmkt6CYbNKbvL59
-BqqGq4DoHrUTPjd92ybq0fXOZQKM/Fr6OsUVaTVPUYtsz3wpG1MTiRN82QJACX6+
-vggb8yuVU8QAuPW9cu769q1zsTKEVLcf3C9xKhiXppQEyOkLFT3xYh4KGGQ06meG
-m/6Z+SS7KCIM2+6UCQJBANHIzgxDWtrLuWJviNh9EbCsdMioxBH+LGaqFKLC70xD
-Pyoqn+QJQu/ekT+FUb0BeFJfGPzFjh1mFYn4tXxWqMs=
+MIICXgIBAAKBgQCyAye51iSkbeGfDteKcYZi3yv4ZDtRU+D6cZrCEECXvQYnQ1oa
+HGL0yj6zuSAWiaKqLh6XOnA9/vf/utUesmgHftBoGIo7qpwBDh7vtZeW1QuloP2j
+AiG1Wm/kwTa/YXtArHMDPUB15526IquVgYt0nvrfJxinfyODNvAVIiLbewIDAQAB
+AoGAMV1KoPBPjQGjtbYp84xz1etJiEJTaMQ3+XuTjQlwwCN9F1pIHEGO9482QCSw
+T0+vuj274fgktCyGnXY0L6UNz7+0wNhUj5oP2IeJdmgcJbv9tcR126rhryr4bx6H
+2sZdLL4MtxjzRNkURS748zeGET/NuIhpQ4YjnUJ27YOeNtECQQDiItcRkyfMcj+r
+/8JU8h9ifOV5tMOyPV4z6Hfli1X+Xa1OcIieE2nzkaa9LHPEi3+LNw41LItUDbMZ
+/Aztm4VVAkEAyYVbbbebVrgoOF7ueafHZeNToc96FEn04H+tN8AgwaI4+U1Q7oga
+EAjVD++e0NfUUJpeyiygBa9NlzB9XYXdjwJBAJobUCHD/R1Qxp96fn7ROh4uK1xT
+mgG/3JDXXc3qtMHSKScJfbDsXgoFOnI09vf8cQD4lhAauSCg7WtJ362VjLkCQQCu
+eVRoUNAgK78+1wo3sAiWcVRGQyDaEhH+kOxC2YhCvZYAWm1Yp+OQwGTfsEHbZRIA
+Wzb4adx+L4HJBYV1BGKHAkEAvSCAANbm8iaLkCG4EfEyrhIpbJDY2Cx3WO08+ZOz
+ekMspMikGmMQfXXroBpnJ8SGVLYSjf2hQQySwDa00hmyBA==
 -----END RSA PRIVATE KEY-----
diff --git a/orbsvcs/tests/Security/Secure_Invocation/cacert.pem b/orbsvcs/tests/Security/Secure_Invocation/cacert.pem
index a9e905f4e6c..d98dd5918cb 100644
--- a/orbsvcs/tests/Security/Secure_Invocation/cacert.pem
+++ b/orbsvcs/tests/Security/Secure_Invocation/cacert.pem
@@ -1,21 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIIDfTCCAuagAwIBAgIBADANBgkqhkiG9w0BAQQFADCBjDELMAkGA1UEBhMCVVMx
-CzAJBgNVBAgTAkNBMQ8wDQYDVQQHEwZJcnZpbmUxEjAQBgNVBAoTCURPQyBHcm91
-cDEQMA4GA1UECxYHVUNJX0RPQzERMA8GA1UEAxMIUHJpeWFua2ExJjAkBgkqhkiG
-9w0BCQEWF3Bnb250bGFAZG9jLmVjZS51Y2kuZWR1MB4XDTAxMDYxMTE3MjI0MVoX
-DTExMDYwOTE3MjI0MVowgYwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEPMA0G
-A1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAOBgNVBAsWB1VDSV9E
-T0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkBFhdwZ29udGxhQGRv
-Yy5lY2UudWNpLmVkdTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyFiCRDUH
-nGJqQG9jT/2PhZUAgfwXvIwfDM8m/WujCt/buDcrOz767shBsk4HZhW91Vm4mE03
-K1zfCzojRigf28uyB/rlp60p2Fq0wvZBNNU5Muia6esleR4unb4QslOpcFhct/9n
-UPnlnnsZOTaGWaELNKEjYfHqPh8PQ0lYurECAwEAAaOB7DCB6TAdBgNVHQ4EFgQU
-0Y6IZjkLbLbtZ5aoKLcfd7Yc/kYwgbkGA1UdIwSBsTCBroAU0Y6IZjkLbLbtZ5ao
-KLcfd7Yc/kahgZKkgY8wgYwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEPMA0G
-A1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAOBgNVBAsWB1VDSV9E
-T0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkBFhdwZ29udGxhQGRv
-Yy5lY2UudWNpLmVkdYIBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4GB
-AHYi8ulIzUI3p3+Ma16rumZxvKcmkJJbU6fpAv4ZvK6AWyy+6Ja0GD5N3SGEx+xU
-nMffTR+LePa9PAZiR7dNkF6ikPxXZu4jn8KY2zFT3SB/VjCoEetR9i9QI//O0Fea
-3yZ0NygNWe5cyVDLCb4meucJpsClfyL28DWzMwD2liX3
+MIICgDCCAemgAwIBAgIJAO8E230uBaq+MA0GCSqGSIb3DQEBBQUAMDUxCzAJBgNV
+BAYTAlVTMRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDAe
+Fw0xMTA2MTUxMzU2MDRaFw0yMTA2MTIxMzU2MDRaMDUxCzAJBgNVBAYTAlVTMRIw
+EAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAxzlgJm5rZMTZEQCa7m3/JPbykh4FT7DwcrWBgDRF
+Jk0wgi4K7AKOFdCfOMqbW1Ps5ITbzgwq2yNXOrocKYs//02ewppKx5bxOE5wTA9v
+qwvaoJUeQ8PVEY+RVi2z+CP1xFIVKOCJtrg5WwWE9Vwvu3iyTe95dR1T95Hkrl0I
+yHECAwEAAaOBlzCBlDAdBgNVHQ4EFgQU/XO+9DMzOBifuZxp1BL+gTGVAwowZQYD
+VR0jBF4wXIAU/XO+9DMzOBifuZxp1BL+gTGVAwqhOaQ3MDUxCzAJBgNVBAYTAlVT
+MRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cIIJAO8E230u
+Baq+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAUxxR/7U35mIGJ7c/
+KfZZYze4/Aio7mf9QG0DA55F9DlB16IOJuRXqeMY2Lo+WFo7pszDX8TbucWtWJC6
+pMIVamWLTpgfVrWeTcafio/puqTALKfZ5LHzHieu1QNvFPQxMx1DZ5Eawowhl7ua
+4ERB9b/3K4StZjMUkPmBolSIkPo=
 -----END CERTIFICATE-----
diff --git a/orbsvcs/tests/Security/Secure_Invocation/client_cert.pem b/orbsvcs/tests/Security/Secure_Invocation/client_cert.pem
index 0bebb696cfc..b86bd5de1d2 100644
--- a/orbsvcs/tests/Security/Secure_Invocation/client_cert.pem
+++ b/orbsvcs/tests/Security/Secure_Invocation/client_cert.pem
@@ -1,16 +1,59 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 4097 (0x1001)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Tennessee, O=DOC Group
+        Validity
+            Not Before: Jun 15 14:01:34 2011 GMT
+            Not After : May 25 14:01:34 2032 GMT
+        Subject: C=US, ST=Tennessee, O=DOC Group, CN=Build Czar Client
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:cf:7f:8e:42:bf:bb:c0:a6:23:7e:07:a4:13:ba:
+                    b6:ba:cd:4c:ed:c4:9c:97:46:32:dc:d5:e9:63:59:
+                    59:b8:7c:0d:7a:97:ad:3f:29:dd:fc:40:4e:48:cc:
+                    b2:1b:15:c4:98:59:a8:b0:b0:38:23:d2:d8:81:22:
+                    27:1b:77:64:d6:40:c0:02:41:b6:db:a8:25:4d:c6:
+                    a1:f5:03:f6:fa:8a:d3:1c:b5:a4:a9:4c:a5:62:19:
+                    89:e3:dc:d8:ac:68:47:96:0f:3c:10:1a:ec:00:81:
+                    10:aa:13:3d:99:48:3a:ae:2b:ac:b9:de:5b:20:7c:
+                    06:4e:57:64:af:2d:b3:88:ef
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                6F:13:BA:8B:91:ED:FA:22:DC:28:26:D4:74:5C:46:A7:B2:B2:A9:10
+            X509v3 Authority Key Identifier: 
+                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
+
+    Signature Algorithm: sha1WithRSAEncryption
+        bc:6f:d5:c7:68:a0:3c:8d:3a:39:61:ff:50:80:c7:a3:b9:28:
+        aa:c8:7b:7e:2d:af:26:e1:0a:39:94:9d:a8:94:c8:cd:82:f5:
+        a5:fc:d1:df:3d:3f:55:c7:5b:f9:89:14:78:59:d6:64:2d:32:
+        42:23:d9:96:9c:50:34:d2:81:17:e3:cc:09:57:13:fc:ae:3b:
+        ed:ff:55:03:d5:c2:dd:a5:5a:f1:c5:66:55:9f:a2:77:74:2f:
+        76:84:93:7c:03:b9:c1:9f:df:41:20:06:57:e4:e2:eb:e7:10:
+        67:42:63:02:d1:a8:53:f1:4d:9b:91:71:37:e4:c2:02:dd:e1:
+        b9:04
 -----BEGIN CERTIFICATE-----
-MIICgzCCAewCAQYwDQYJKoZIhvcNAQEEBQAwgYwxCzAJBgNVBAYTAlVTMQswCQYD
-VQQIEwJDQTEPMA0GA1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAO
-BgNVBAsWB1VDSV9ET0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkB
-FhdwZ29udGxhQGRvYy5lY2UudWNpLmVkdTAeFw0wMTA2MTExODEwMzRaFw0xMTA2
-MDkxODEwMzRaMIGGMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExDzANBgNVBAcT
-BklydmluZTEQMA4GA1UEChMHVEFPK09DSTEMMAoGA1UECxMDT0NJMREwDwYDVQQD
-EwhQcml5YW5rYTEmMCQGCSqGSIb3DQEJARYXcGdvbnRsYUBkb2MuZWNlLnVjaS5l
-ZHUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL6f8pBX7Mi3FPY/OYBOq+kb
-wQ3WX0Z8+nDxd7AiWDAx2AL5EaX8xnUiRi96OJ+CYPCYOUlavGVzZkRVMFdOuHAn
-RvY2sCpvU2rkKpEx9Pd50l7FLnXJuflnRc6zIEKOvuQcPJvsP4AaxaFxTnZExXQJ
-kDEiQP3mGID/eXtUzywbAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAuvSoOnMB6sxj
-ft9YbdLeyATTPzHbxAb6zQo72DUmM3roNowUrefHymU8jZoC6HeaROeKCU0MkVes
-l/jYlz/OwSYkbyGNIUkq4DHEWKzXEg8M603fsWK6IK3T5iPBHY+l/mYSEHJPfypZ
-fl/y4YSNJZlrz6kCIHTcwfHXDRC1mjM=
+MIICeDCCAeGgAwIBAgICEAEwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
+EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
+NTE0MDEzNFoXDTMyMDUyNTE0MDEzNFowUTELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
+CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMRowGAYDVQQDExFCdWlsZCBD
+emFyIENsaWVudDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAz3+OQr+7wKYj
+fgekE7q2us1M7cScl0Yy3NXpY1lZuHwNepetPynd/EBOSMyyGxXEmFmosLA4I9LY
+gSInG3dk1kDAAkG226glTcah9QP2+orTHLWkqUylYhmJ49zYrGhHlg88EBrsAIEQ
+qhM9mUg6riusud5bIHwGTldkry2ziO8CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglg
+hkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0O
+BBYEFG8TuouR7foi3Cgm1HRcRqeysqkQMB8GA1UdIwQYMBaAFP1zvvQzMzgYn7mc
+adQS/oExlQMKMA0GCSqGSIb3DQEBBQUAA4GBALxv1cdooDyNOjlh/1CAx6O5KKrI
+e34trybhCjmUnaiUyM2C9aX80d89P1XHW/mJFHhZ1mQtMkIj2ZacUDTSgRfjzAlX
+E/yuO+3/VQPVwt2lWvHFZlWfond0L3aEk3wDucGf30EgBlfk4uvnEGdCYwLRqFPx
+TZuRcTfkwgLd4bkE
 -----END CERTIFICATE-----
diff --git a/orbsvcs/tests/Security/Secure_Invocation/client_key.pem b/orbsvcs/tests/Security/Secure_Invocation/client_key.pem
index 1428b501712..e761037f237 100644
--- a/orbsvcs/tests/Security/Secure_Invocation/client_key.pem
+++ b/orbsvcs/tests/Security/Secure_Invocation/client_key.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQC+n/KQV+zItxT2PzmATqvpG8EN1l9GfPpw8XewIlgwMdgC+RGl
-/MZ1IkYvejifgmDwmDlJWrxlc2ZEVTBXTrhwJ0b2NrAqb1Nq5CqRMfT3edJexS51
-ybn5Z0XOsyBCjr7kHDyb7D+AGsWhcU52RMV0CZAxIkD95hiA/3l7VM8sGwIDAQAB
-AoGABGaa6fwtqkCXykuRX0XxsBME9PXTA0SVX5AjjDxuvsYXz5HCd4uLZV7iMexn
-bD9NT6CkCe5/VPRCEyfIUuutVFc7lkPwuRw5FvNcf4gMH9ltufQfH/KeR7d2Jvge
-zrTOH7nicshy67mfOEOaoDphWoT9uy+7ayym+EsJLJU37VkCQQD6xLRu5r9tKX2/
-NfIQsGxF3TZyXgxcuxMh9JOq5E9nBwhr1JaXDbXktXfIK/F3XWHLFS8CIg6PhgGY
-i/+UtGzvAkEAwpoHp89U2jLdVRoIcwy5o7Ocwk3HCXem3UgFWXzzunGM1x+ozDFA
-uo5nyXiAO6Buka9C2czje275kE18BbqLlQJBAMJNf/EeYdzXdVOfHPzJdlt72CAt
-ty5y1ZRNyc10MgIGdQP4KObJ/NJFuZYkVmjCtm+A7neco+OZVcs5TsOOOYkCQBHQ
-6EKEyM/xODJCX+OolpZWK1PeqwpC2hQIM/Uta2L2Yl6Pl3SaTcLGptnbHmJXHchY
-s1YdW/ZBArgjX+dmXMECQApTKWbVLmNsEoOlHU/I/KhGsfuojrzBMMe3FKLiHpmu
-u86L3vu3OGZFcPgjazxWZcip8JekeJ7c+6suLNNRQ5I=
+MIICXQIBAAKBgQDPf45Cv7vApiN+B6QTura6zUztxJyXRjLc1eljWVm4fA16l60/
+Kd38QE5IzLIbFcSYWaiwsDgj0tiBIicbd2TWQMACQbbbqCVNxqH1A/b6itMctaSp
+TKViGYnj3NisaEeWDzwQGuwAgRCqEz2ZSDquK6y53lsgfAZOV2SvLbOI7wIDAQAB
+AoGACTQ0QDu2/U2hR2bZXVKr5k9S+Tz+YSto+Ci46II/G5LNGkH+Gk4mHZlQn6QM
+xmzJwqQ/ek7mvpgMqHW2XF6IZ3AUmgNqpKdkFMbmkRworAEGRHvJcXy6RhiZI4kv
+UQWc9qEBA6/iR/B0sGsCgTTkv4davCs+5You5+oSyRiRu7kCQQDuQTkSkNm7fwFS
+lrEGmJjzJ3gXMHuv/lL2n2HJV67BBv7Aq7JDdciVLr90chcmXkIwPCywbdWVV9jz
+HWQ6GXKTAkEA3vPm3CKRHMFoSGwiX6qhM2432yLIlpjlfmSj3S6LnhhTJhYS6KMO
+6Ddv4vZ20zl3r4GAaXOyMTtZ6vQlZ8W9tQJBAMvRAAHh6GF9RKRiRQ5ffHiGSzWL
+RERKTK6tqfmUCOsYENbCCr2rBOyaES6Ma0FnYTfiQlirnQslG3Lesd8B5gECQQDS
+FG6PNP8ZYmDaBRJqpIQayxtUoDT0OoPckgYZrvcd8/u9YoVUsfik9T+3U9dpdrgB
+JvyR4NOiMjOrAXyRiLEVAkA9DutrYXzznEAyOvEEtyK92Eb2oTpu1svzRATc/i0w
+UTwLkFi+1m24HJ5MIGyRTHsNj79lj5v5U91lGIINHXXU
 -----END RSA PRIVATE KEY-----
diff --git a/orbsvcs/tests/Security/Secure_Invocation/client_key_nopasswd.pem b/orbsvcs/tests/Security/Secure_Invocation/client_key_nopasswd.pem
deleted file mode 100644
index 35e449a2493..00000000000
--- a/orbsvcs/tests/Security/Secure_Invocation/client_key_nopasswd.pem
+++ /dev/null
@@ -1,16 +0,0 @@
-RSA key ok
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDBuQXJQhW75XZJfatysGHE3/RXFeMSB8TOk/geXhlUAQTaHj/0
-+eQLNnz2ed8XFoyZFJYioUrcAHyC3LGv7CemhPAW0ZEBgXG8QX1eG8T+NlPh5pC8
-pMg8R67aVr/Rs3jvXsh7lI5rqCQ6Mr1fCg6qVdnJyH04gKKv4b0Iu29FDQIDAQAB
-AoGADRU7yM3HvfrPNENicspqr+sYC1GVFkCkD/d6SEK+nye6diiY1SiTOBaj9dlh
-MaP6NtRnF0uhTJ5TylqxPVpLixs6Dot/lX0Mu/bD80Zez1bWdQFivszOcDnxylHX
-j4z3Sv5nSPWoOgssDVxWNpI9QHcC2E7zII094drJEG/UZIECQQDy0axJBAahSgMX
-9CfpWJjXEMKD58RwddbiS2tGboLzdYXUVaE1qr4GN70jypGC4HmWZ6XV5HX4+fy3
-QltXF3GdAkEAzD0VpmOCan7jLty6+qklEwpyzMDJ9VH9QwfMyS5oSO4Dh08lC6WT
-Ss+nQlXFwFYszKxd6kznEECGPlKybiC+MQJBANFdsKuUaRMQ+fHhd7hfyAlITi/l
-2x8MvCeK2Ah2qTq6jpYy7zmS6x35WYBO3YB3hN8Gp5rxzjbLdfedo5xIfpECQGkk
-ASM5EwhT7gxP4YnszYMx28uAa/d4j9KUD156H4F71iEwIzgNsvfOUqKZmUXclw9+
-pJJbqI/7R6CJ3gVHoeECQGpfgurJz2V5Z2/qsZIDJXgxFoW6vY9rZbZU80ZYx3Cb
-RINCjB0G0ThsqH7FqCC3PAkEt0xThXqT2SM8ezVlENM=
------END RSA PRIVATE KEY-----
diff --git a/orbsvcs/tests/Security/Secure_Invocation/server_cert.pem b/orbsvcs/tests/Security/Secure_Invocation/server_cert.pem
index 0fc394c24d7..5402ae2497a 100644
--- a/orbsvcs/tests/Security/Secure_Invocation/server_cert.pem
+++ b/orbsvcs/tests/Security/Secure_Invocation/server_cert.pem
@@ -1,16 +1,59 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 4096 (0x1000)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Tennessee, O=DOC Group
+        Validity
+            Not Before: Jun 15 14:01:15 2011 GMT
+            Not After : May 25 14:01:15 2032 GMT
+        Subject: C=US, ST=Tennessee, O=DOC Group, CN=DOC Group Build Czar Server
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:b2:03:27:b9:d6:24:a4:6d:e1:9f:0e:d7:8a:71:
+                    86:62:df:2b:f8:64:3b:51:53:e0:fa:71:9a:c2:10:
+                    40:97:bd:06:27:43:5a:1a:1c:62:f4:ca:3e:b3:b9:
+                    20:16:89:a2:aa:2e:1e:97:3a:70:3d:fe:f7:ff:ba:
+                    d5:1e:b2:68:07:7e:d0:68:18:8a:3b:aa:9c:01:0e:
+                    1e:ef:b5:97:96:d5:0b:a5:a0:fd:a3:02:21:b5:5a:
+                    6f:e4:c1:36:bf:61:7b:40:ac:73:03:3d:40:75:e7:
+                    9d:ba:22:ab:95:81:8b:74:9e:fa:df:27:18:a7:7f:
+                    23:83:36:f0:15:22:22:db:7b
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                0C:27:05:12:9B:D5:4B:F9:43:32:6B:77:7B:A2:0D:34:7F:6C:0A:BC
+            X509v3 Authority Key Identifier: 
+                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
+
+    Signature Algorithm: sha1WithRSAEncryption
+        0d:bf:65:2a:a5:02:75:6c:c4:5a:3c:1d:3c:25:51:16:1a:f8:
+        78:ad:49:f6:f4:a4:c1:97:e4:c8:0b:ac:9e:71:0e:be:1e:e6:
+        1d:2e:c7:d2:4f:1e:e8:c7:21:7c:58:27:0e:6d:93:11:7e:64:
+        24:57:44:c1:c1:5a:d0:76:82:79:70:82:36:06:f2:48:60:e8:
+        6a:20:a7:92:09:00:73:75:b2:f9:cb:97:35:d6:aa:8e:87:11:
+        20:e2:dd:8a:c3:9c:c4:aa:f0:57:04:4e:e2:b3:8b:fb:9a:4f:
+        4b:60:b7:2e:3b:89:98:38:02:25:24:ff:b1:f1:c0:ad:01:eb:
+        37:bd
 -----BEGIN CERTIFICATE-----
-MIICgzCCAewCAQMwDQYJKoZIhvcNAQEEBQAwgYwxCzAJBgNVBAYTAlVTMQswCQYD
-VQQIEwJDQTEPMA0GA1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAO
-BgNVBAsWB1VDSV9ET0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkB
-FhdwZ29udGxhQGRvYy5lY2UudWNpLmVkdTAeFw0wMTA2MTExNzQ4NTVaFw0xMTA2
-MDkxNzQ4NTVaMIGGMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExDzANBgNVBAcT
-BklydmluZTEMMAoGA1UEChMDT0NJMRAwDgYDVQQLEwdUQU8rT0NJMREwDwYDVQQD
-EwhQcml5YW5rYTEmMCQGCSqGSIb3DQEJARYXcGdvbnRsYUBkb2MuZWNlLnVjaS5l
-ZHUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANKXmudWiLVu/zdBlSr0/dlr
-pRe+Ie26cPyMo5lKiYNY77tABTiOXe5qLUEryjQ/fZ74gmBe4AYFwb7nu/f58X4A
-0tzSg2M4spWM7N4tzf+YbcUipRt9sEISxwfUxNNWTKnLxvCmkzOsISisukdzTkqJ
-fdzEcPfhO2BZKOdmlg1hAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAjUl3ami01tPY
-P1vMp2642dsIKLZis0TmeWp6HNpm52TbiGZOCqDrvtSQ9+2vGz0BkHvGqWKtD+wv
-zJH23fNnqFuzy1C1xtjoeqhXECTsWVTVdoEox8hSWxPiYRE2dioraZQQ5ENDosh+
-V9YcqJJpnKDUOSGVGuyaU7DpR8yK0pc=
+MIICgjCCAeugAwIBAgICEAAwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
+EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
+NTE0MDExNVoXDTMyMDUyNTE0MDExNVowWzELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
+CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMSQwIgYDVQQDExtET0MgR3Jv
+dXAgQnVpbGQgQ3phciBTZXJ2ZXIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
+ALIDJ7nWJKRt4Z8O14pxhmLfK/hkO1FT4PpxmsIQQJe9BidDWhocYvTKPrO5IBaJ
+oqouHpc6cD3+9/+61R6yaAd+0GgYijuqnAEOHu+1l5bVC6Wg/aMCIbVab+TBNr9h
+e0CscwM9QHXnnboiq5WBi3Se+t8nGKd/I4M28BUiItt7AgMBAAGjezB5MAkGA1Ud
+EwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmlj
+YXRlMB0GA1UdDgQWBBQMJwUSm9VL+UMya3d7og00f2wKvDAfBgNVHSMEGDAWgBT9
+c770MzM4GJ+5nGnUEv6BMZUDCjANBgkqhkiG9w0BAQUFAAOBgQANv2UqpQJ1bMRa
+PB08JVEWGvh4rUn29KTBl+TIC6yecQ6+HuYdLsfSTx7oxyF8WCcObZMRfmQkV0TB
+wVrQdoJ5cII2BvJIYOhqIKeSCQBzdbL5y5c11qqOhxEg4t2Kw5zEqvBXBE7is4v7
+mk9LYLcuO4mYOAIlJP+x8cCtAes3vQ==
 -----END CERTIFICATE-----
diff --git a/orbsvcs/tests/Security/Secure_Invocation/server_key.pem b/orbsvcs/tests/Security/Secure_Invocation/server_key.pem
index 567a41da6dc..be238899a9f 100644
--- a/orbsvcs/tests/Security/Secure_Invocation/server_key.pem
+++ b/orbsvcs/tests/Security/Secure_Invocation/server_key.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDSl5rnVoi1bv83QZUq9P3Za6UXviHtunD8jKOZSomDWO+7QAU4
-jl3uai1BK8o0P32e+IJgXuAGBcG+57v3+fF+ANLc0oNjOLKVjOzeLc3/mG3FIqUb
-fbBCEscH1MTTVkypy8bwppMzrCEorLpHc05KiX3cxHD34TtgWSjnZpYNYQIDAQAB
-AoGAC/TxpZrjLjH8KZ3+oy6/zv1upTd1Y7MHQT+W9lgmEKAXFHGhGkHzEVtT8HRV
-CbxlHIaNmH0qiQ0AoB82K/E0BdIMvE+y2qQwlpMfBMX6/TACORReJN3NXGsXwHP4
-/pNlS4LX7/NZbxlReAlDNP+FO8sdKZTyM3VXHFWJbmm4wsECQQD06zQ4uthp0zI9
-WTZiiAUgYwOcnLnXwfWOLAr8RCnYgwiS7MBCcmhZAgWX5SZJYVCwEJ12DAHy02NJ
-EhiSgo+JAkEA3B7PcS5FqZFi6wVjEG6yF8OuSb/rl+FZfV6utZdCVdMPxacEVxlD
-q7H/dk23O4WwASBriU0PR9/KG3T/LvKBGQJAaYRn1EUTdcxKqcmkt6CYbNKbvL59
-BqqGq4DoHrUTPjd92ybq0fXOZQKM/Fr6OsUVaTVPUYtsz3wpG1MTiRN82QJACX6+
-vggb8yuVU8QAuPW9cu769q1zsTKEVLcf3C9xKhiXppQEyOkLFT3xYh4KGGQ06meG
-m/6Z+SS7KCIM2+6UCQJBANHIzgxDWtrLuWJviNh9EbCsdMioxBH+LGaqFKLC70xD
-Pyoqn+QJQu/ekT+FUb0BeFJfGPzFjh1mFYn4tXxWqMs=
+MIICXgIBAAKBgQCyAye51iSkbeGfDteKcYZi3yv4ZDtRU+D6cZrCEECXvQYnQ1oa
+HGL0yj6zuSAWiaKqLh6XOnA9/vf/utUesmgHftBoGIo7qpwBDh7vtZeW1QuloP2j
+AiG1Wm/kwTa/YXtArHMDPUB15526IquVgYt0nvrfJxinfyODNvAVIiLbewIDAQAB
+AoGAMV1KoPBPjQGjtbYp84xz1etJiEJTaMQ3+XuTjQlwwCN9F1pIHEGO9482QCSw
+T0+vuj274fgktCyGnXY0L6UNz7+0wNhUj5oP2IeJdmgcJbv9tcR126rhryr4bx6H
+2sZdLL4MtxjzRNkURS748zeGET/NuIhpQ4YjnUJ27YOeNtECQQDiItcRkyfMcj+r
+/8JU8h9ifOV5tMOyPV4z6Hfli1X+Xa1OcIieE2nzkaa9LHPEi3+LNw41LItUDbMZ
+/Aztm4VVAkEAyYVbbbebVrgoOF7ueafHZeNToc96FEn04H+tN8AgwaI4+U1Q7oga
+EAjVD++e0NfUUJpeyiygBa9NlzB9XYXdjwJBAJobUCHD/R1Qxp96fn7ROh4uK1xT
+mgG/3JDXXc3qtMHSKScJfbDsXgoFOnI09vf8cQD4lhAauSCg7WtJ362VjLkCQQCu
+eVRoUNAgK78+1wo3sAiWcVRGQyDaEhH+kOxC2YhCvZYAWm1Yp+OQwGTfsEHbZRIA
+Wzb4adx+L4HJBYV1BGKHAkEAvSCAANbm8iaLkCG4EfEyrhIpbJDY2Cx3WO08+ZOz
+ekMspMikGmMQfXXroBpnJ8SGVLYSjf2hQQySwDa00hmyBA==
 -----END RSA PRIVATE KEY-----
diff --git a/orbsvcs/tests/Security/Secure_Invocation/server_key_nopasswd.pem b/orbsvcs/tests/Security/Secure_Invocation/server_key_nopasswd.pem
deleted file mode 100644
index 2381bdcc6df..00000000000
--- a/orbsvcs/tests/Security/Secure_Invocation/server_key_nopasswd.pem
+++ /dev/null
@@ -1,16 +0,0 @@
-RSA key ok
------BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQDOtfLxhcWktrjY/U9Mdsy9WaUeqFZGWkz2gknKMNrfJnKAdmuU
-RaP2G9X565FhgyrEpb5bYJUC3aTLhdr5NsDFt3V1hhs9rev6WSeONmiAlOrUrKCB
-cpF3K0HyU4bVp06/FgtWFUp8ja88B8zLhwak6KAGYBUQZXVtMsaJliYLNQIDAQAB
-AoGAXIqghPg6j48uGhbtlXHqHysu/Ran6T8sDYAuwNI2aoiv4kshxnOW/+teVFDd
-+SXb08XP/uCyVWIdEPCQI9obWppALzQhF5kALhchnlEATkVxkdx6T5PyGnFq5rpc
-NCfb3Q68T5bcFvsgup9Lt8JpGBQGvjYJZYkJuMvWmH6Bc9ECQQD4TwB+p5MjRALX
-lcMI8pURt6CKxpWLyFUUkQi6HksXzxeh4PDErLxsyFexKec7TOap5xnWZMPkjl76
-BdW65abrAkEA1R0XSCfu3B4LnX4zlDi+nUXG8YvquuZ21TRrNg3YmVcyF+jvkM1f
-4MGRPRF3hnTuZhnlD+wEubpmpcoNnNTOXwJBAIfZOQ0SAzblC6UE42puxU2nJ+ck
-1EZgeOPCoYKp9i11eJlw5mjDlGbziL59jWttHDlSHVmlUWMm3SFutcsFv7cCQQCK
-i+UM5dklhOrsMpV5sQJK4IgblGi/pQBwTym79HhyB/vrC2ZjbwD77xtq5iYcZXxv
-KDqAhWH1FLeS5K7A3KBlAkEAqwIhKyV1kK0EtvpNMprfIGNccRjNX8TJEQsN49EE
-luhKkAam4CoA1R2wZc0VHfWqilK0qhrezXxlo4OeElxiRg==
------END RSA PRIVATE KEY-----
diff --git a/orbsvcs/tests/Security/cert/DOCCA/cacert.pem b/orbsvcs/tests/Security/cert/DOCCA/cacert.pem
new file mode 100644
index 00000000000..d98dd5918cb
--- /dev/null
+++ b/orbsvcs/tests/Security/cert/DOCCA/cacert.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE-----
+MIICgDCCAemgAwIBAgIJAO8E230uBaq+MA0GCSqGSIb3DQEBBQUAMDUxCzAJBgNV
+BAYTAlVTMRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDAe
+Fw0xMTA2MTUxMzU2MDRaFw0yMTA2MTIxMzU2MDRaMDUxCzAJBgNVBAYTAlVTMRIw
+EAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAxzlgJm5rZMTZEQCa7m3/JPbykh4FT7DwcrWBgDRF
+Jk0wgi4K7AKOFdCfOMqbW1Ps5ITbzgwq2yNXOrocKYs//02ewppKx5bxOE5wTA9v
+qwvaoJUeQ8PVEY+RVi2z+CP1xFIVKOCJtrg5WwWE9Vwvu3iyTe95dR1T95Hkrl0I
+yHECAwEAAaOBlzCBlDAdBgNVHQ4EFgQU/XO+9DMzOBifuZxp1BL+gTGVAwowZQYD
+VR0jBF4wXIAU/XO+9DMzOBifuZxp1BL+gTGVAwqhOaQ3MDUxCzAJBgNVBAYTAlVT
+MRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cIIJAO8E230u
+Baq+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAUxxR/7U35mIGJ7c/
+KfZZYze4/Aio7mf9QG0DA55F9DlB16IOJuRXqeMY2Lo+WFo7pszDX8TbucWtWJC6
+pMIVamWLTpgfVrWeTcafio/puqTALKfZ5LHzHieu1QNvFPQxMx1DZ5Eawowhl7ua
+4ERB9b/3K4StZjMUkPmBolSIkPo=
+-----END CERTIFICATE-----
diff --git a/orbsvcs/tests/Security/cert/DOCCA/index.txt b/orbsvcs/tests/Security/cert/DOCCA/index.txt
new file mode 100644
index 00000000000..3290cfd68b2
--- /dev/null
+++ b/orbsvcs/tests/Security/cert/DOCCA/index.txt
@@ -0,0 +1,2 @@
+V	320525140115Z		1000	unknown	/C=US/ST=Tennessee/O=DOC Group/CN=DOC Group Build Czar Server
+V	320525140134Z		1001	unknown	/C=US/ST=Tennessee/O=DOC Group/CN=Build Czar Client
diff --git a/orbsvcs/tests/Security/cert/DOCCA/index.txt.attr b/orbsvcs/tests/Security/cert/DOCCA/index.txt.attr
new file mode 100644
index 00000000000..3a7e39e6ee6
--- /dev/null
+++ b/orbsvcs/tests/Security/cert/DOCCA/index.txt.attr
@@ -0,0 +1 @@
+unique_subject = no
diff --git a/orbsvcs/tests/Security/cert/DOCCA/index.txt.attr.old b/orbsvcs/tests/Security/cert/DOCCA/index.txt.attr.old
new file mode 100644
index 00000000000..8f7e63a3475
--- /dev/null
+++ b/orbsvcs/tests/Security/cert/DOCCA/index.txt.attr.old
@@ -0,0 +1 @@
+unique_subject = yes
diff --git a/orbsvcs/tests/Security/cert/DOCCA/index.txt.old b/orbsvcs/tests/Security/cert/DOCCA/index.txt.old
new file mode 100644
index 00000000000..a4a1b736524
--- /dev/null
+++ b/orbsvcs/tests/Security/cert/DOCCA/index.txt.old
@@ -0,0 +1 @@
+V	320525140115Z		1000	unknown	/C=US/ST=Tennessee/O=DOC Group/CN=DOC Group Build Czar Server
diff --git a/orbsvcs/tests/Security/cert/DOCCA/newcerts/1000.pem b/orbsvcs/tests/Security/cert/DOCCA/newcerts/1000.pem
new file mode 100644
index 00000000000..5402ae2497a
--- /dev/null
+++ b/orbsvcs/tests/Security/cert/DOCCA/newcerts/1000.pem
@@ -0,0 +1,59 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 4096 (0x1000)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Tennessee, O=DOC Group
+        Validity
+            Not Before: Jun 15 14:01:15 2011 GMT
+            Not After : May 25 14:01:15 2032 GMT
+        Subject: C=US, ST=Tennessee, O=DOC Group, CN=DOC Group Build Czar Server
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:b2:03:27:b9:d6:24:a4:6d:e1:9f:0e:d7:8a:71:
+                    86:62:df:2b:f8:64:3b:51:53:e0:fa:71:9a:c2:10:
+                    40:97:bd:06:27:43:5a:1a:1c:62:f4:ca:3e:b3:b9:
+                    20:16:89:a2:aa:2e:1e:97:3a:70:3d:fe:f7:ff:ba:
+                    d5:1e:b2:68:07:7e:d0:68:18:8a:3b:aa:9c:01:0e:
+                    1e:ef:b5:97:96:d5:0b:a5:a0:fd:a3:02:21:b5:5a:
+                    6f:e4:c1:36:bf:61:7b:40:ac:73:03:3d:40:75:e7:
+                    9d:ba:22:ab:95:81:8b:74:9e:fa:df:27:18:a7:7f:
+                    23:83:36:f0:15:22:22:db:7b
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                0C:27:05:12:9B:D5:4B:F9:43:32:6B:77:7B:A2:0D:34:7F:6C:0A:BC
+            X509v3 Authority Key Identifier: 
+                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
+
+    Signature Algorithm: sha1WithRSAEncryption
+        0d:bf:65:2a:a5:02:75:6c:c4:5a:3c:1d:3c:25:51:16:1a:f8:
+        78:ad:49:f6:f4:a4:c1:97:e4:c8:0b:ac:9e:71:0e:be:1e:e6:
+        1d:2e:c7:d2:4f:1e:e8:c7:21:7c:58:27:0e:6d:93:11:7e:64:
+        24:57:44:c1:c1:5a:d0:76:82:79:70:82:36:06:f2:48:60:e8:
+        6a:20:a7:92:09:00:73:75:b2:f9:cb:97:35:d6:aa:8e:87:11:
+        20:e2:dd:8a:c3:9c:c4:aa:f0:57:04:4e:e2:b3:8b:fb:9a:4f:
+        4b:60:b7:2e:3b:89:98:38:02:25:24:ff:b1:f1:c0:ad:01:eb:
+        37:bd
+-----BEGIN CERTIFICATE-----
+MIICgjCCAeugAwIBAgICEAAwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
+EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
+NTE0MDExNVoXDTMyMDUyNTE0MDExNVowWzELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
+CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMSQwIgYDVQQDExtET0MgR3Jv
+dXAgQnVpbGQgQ3phciBTZXJ2ZXIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
+ALIDJ7nWJKRt4Z8O14pxhmLfK/hkO1FT4PpxmsIQQJe9BidDWhocYvTKPrO5IBaJ
+oqouHpc6cD3+9/+61R6yaAd+0GgYijuqnAEOHu+1l5bVC6Wg/aMCIbVab+TBNr9h
+e0CscwM9QHXnnboiq5WBi3Se+t8nGKd/I4M28BUiItt7AgMBAAGjezB5MAkGA1Ud
+EwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmlj
+YXRlMB0GA1UdDgQWBBQMJwUSm9VL+UMya3d7og00f2wKvDAfBgNVHSMEGDAWgBT9
+c770MzM4GJ+5nGnUEv6BMZUDCjANBgkqhkiG9w0BAQUFAAOBgQANv2UqpQJ1bMRa
+PB08JVEWGvh4rUn29KTBl+TIC6yecQ6+HuYdLsfSTx7oxyF8WCcObZMRfmQkV0TB
+wVrQdoJ5cII2BvJIYOhqIKeSCQBzdbL5y5c11qqOhxEg4t2Kw5zEqvBXBE7is4v7
+mk9LYLcuO4mYOAIlJP+x8cCtAes3vQ==
+-----END CERTIFICATE-----
diff --git a/orbsvcs/tests/Security/cert/DOCCA/newcerts/1001.pem b/orbsvcs/tests/Security/cert/DOCCA/newcerts/1001.pem
new file mode 100644
index 00000000000..b86bd5de1d2
--- /dev/null
+++ b/orbsvcs/tests/Security/cert/DOCCA/newcerts/1001.pem
@@ -0,0 +1,59 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 4097 (0x1001)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Tennessee, O=DOC Group
+        Validity
+            Not Before: Jun 15 14:01:34 2011 GMT
+            Not After : May 25 14:01:34 2032 GMT
+        Subject: C=US, ST=Tennessee, O=DOC Group, CN=Build Czar Client
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:cf:7f:8e:42:bf:bb:c0:a6:23:7e:07:a4:13:ba:
+                    b6:ba:cd:4c:ed:c4:9c:97:46:32:dc:d5:e9:63:59:
+                    59:b8:7c:0d:7a:97:ad:3f:29:dd:fc:40:4e:48:cc:
+                    b2:1b:15:c4:98:59:a8:b0:b0:38:23:d2:d8:81:22:
+                    27:1b:77:64:d6:40:c0:02:41:b6:db:a8:25:4d:c6:
+                    a1:f5:03:f6:fa:8a:d3:1c:b5:a4:a9:4c:a5:62:19:
+                    89:e3:dc:d8:ac:68:47:96:0f:3c:10:1a:ec:00:81:
+                    10:aa:13:3d:99:48:3a:ae:2b:ac:b9:de:5b:20:7c:
+                    06:4e:57:64:af:2d:b3:88:ef
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                6F:13:BA:8B:91:ED:FA:22:DC:28:26:D4:74:5C:46:A7:B2:B2:A9:10
+            X509v3 Authority Key Identifier: 
+                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
+
+    Signature Algorithm: sha1WithRSAEncryption
+        bc:6f:d5:c7:68:a0:3c:8d:3a:39:61:ff:50:80:c7:a3:b9:28:
+        aa:c8:7b:7e:2d:af:26:e1:0a:39:94:9d:a8:94:c8:cd:82:f5:
+        a5:fc:d1:df:3d:3f:55:c7:5b:f9:89:14:78:59:d6:64:2d:32:
+        42:23:d9:96:9c:50:34:d2:81:17:e3:cc:09:57:13:fc:ae:3b:
+        ed:ff:55:03:d5:c2:dd:a5:5a:f1:c5:66:55:9f:a2:77:74:2f:
+        76:84:93:7c:03:b9:c1:9f:df:41:20:06:57:e4:e2:eb:e7:10:
+        67:42:63:02:d1:a8:53:f1:4d:9b:91:71:37:e4:c2:02:dd:e1:
+        b9:04
+-----BEGIN CERTIFICATE-----
+MIICeDCCAeGgAwIBAgICEAEwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
+EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
+NTE0MDEzNFoXDTMyMDUyNTE0MDEzNFowUTELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
+CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMRowGAYDVQQDExFCdWlsZCBD
+emFyIENsaWVudDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAz3+OQr+7wKYj
+fgekE7q2us1M7cScl0Yy3NXpY1lZuHwNepetPynd/EBOSMyyGxXEmFmosLA4I9LY
+gSInG3dk1kDAAkG226glTcah9QP2+orTHLWkqUylYhmJ49zYrGhHlg88EBrsAIEQ
+qhM9mUg6riusud5bIHwGTldkry2ziO8CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglg
+hkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0O
+BBYEFG8TuouR7foi3Cgm1HRcRqeysqkQMB8GA1UdIwQYMBaAFP1zvvQzMzgYn7mc
+adQS/oExlQMKMA0GCSqGSIb3DQEBBQUAA4GBALxv1cdooDyNOjlh/1CAx6O5KKrI
+e34trybhCjmUnaiUyM2C9aX80d89P1XHW/mJFHhZ1mQtMkIj2ZacUDTSgRfjzAlX
+E/yuO+3/VQPVwt2lWvHFZlWfond0L3aEk3wDucGf30EgBlfk4uvnEGdCYwLRqFPx
+TZuRcTfkwgLd4bkE
+-----END CERTIFICATE-----
diff --git a/orbsvcs/tests/Security/cert/DOCCA/private/cakey.pem b/orbsvcs/tests/Security/cert/DOCCA/private/cakey.pem
new file mode 100755
index 00000000000..5e30ed7cbc4
--- /dev/null
+++ b/orbsvcs/tests/Security/cert/DOCCA/private/cakey.pem
@@ -0,0 +1,18 @@
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,B750091CEDD08D81
+
+hgGyWUDmh4iOpsZWjg3uZ3TYkW7ku6OoWLuE9QfFHerjwnTUOShnrS3tRZhpp257
+A/NH64tIc5cxo8C4GV7gjysCIJgwkLV81J9JNslAevN2MhJirXlTUtvGBzLey5G3
+MFFtLFDIp+46sIHAW53B5vITIgwhX2hbgdkcR0AWusU/vOK8S20Wm8ph2aQCadcC
+eXk6fO7UyOnPSLo40dIa/t3UtNya/PywisLvW0FK/wiBKx5Qv5HtGKJPVIu6LjBr
+IBrw3fxcsY1Lm7y7JzU0WGpATr3wuFA4u6AE9n/TbWX9X8BL0zj4uqRz37M97/cE
+TMqkIQyNQvj5HtgO6j6XttRc519SiZblRYGaD6ePijQqRcGH455QqPSdAGu/npbO
+0wMBM/zUFGfILVYiHeL84s0pcz1LV+j5bwGInLYXRZtElQlYVYZNNScT9i9chuVl
+zwV9ANrPPgcDUGAJJ3jSTYB9nu3BbwiKc1pkhi2dml8awON7m9H/qMaf2ReX8Omd
+2qK0txGjgqSqsBxlf3CzbcY+Vt3I5PsvBK3a8m3eYz+RXWKGoPxb850praYQeVZL
+fzjGrZOjJ54+q2sNnj8wEbIaYibqCWYXbeHpxdOX7miQhFHTwUMP8rLE2jb5wJQF
+jYqC/aDKAXep2YcjUogyElbGTF2YPqZpXYCY3lzOcB4SpX3LTKOnzm1a0sK6DPEc
+UzTAsrc99mEyepK4tEsUqzCAwggmax/aItuZN5AE4pEUIGye/VkXiNRP4wCMLlpj
+32AX/31NnssFDSDdD/BqeA6uYC/d/tL9yNa8ZLrzBlfY45Rdx3p/Pg==
+-----END RSA PRIVATE KEY-----
diff --git a/orbsvcs/tests/Security/cert/DOCCA/serial b/orbsvcs/tests/Security/cert/DOCCA/serial
new file mode 100644
index 00000000000..7d802a3e710
--- /dev/null
+++ b/orbsvcs/tests/Security/cert/DOCCA/serial
@@ -0,0 +1 @@
+1002
diff --git a/orbsvcs/tests/Security/cert/DOCCA/serial.old b/orbsvcs/tests/Security/cert/DOCCA/serial.old
new file mode 100644
index 00000000000..dd11724042e
--- /dev/null
+++ b/orbsvcs/tests/Security/cert/DOCCA/serial.old
@@ -0,0 +1 @@
+1001
diff --git a/orbsvcs/tests/Security/cert/README b/orbsvcs/tests/Security/cert/README
new file mode 100644
index 00000000000..5df07f00694
--- /dev/null
+++ b/orbsvcs/tests/Security/cert/README
@@ -0,0 +1 @@
+This is a CA used for signing keys in the security tests.  The password for the CA key is DOCGroup
diff --git a/orbsvcs/tests/Security/cert/cacert.pem b/orbsvcs/tests/Security/cert/cacert.pem
new file mode 100644
index 00000000000..d98dd5918cb
--- /dev/null
+++ b/orbsvcs/tests/Security/cert/cacert.pem
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE-----
+MIICgDCCAemgAwIBAgIJAO8E230uBaq+MA0GCSqGSIb3DQEBBQUAMDUxCzAJBgNV
+BAYTAlVTMRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDAe
+Fw0xMTA2MTUxMzU2MDRaFw0yMTA2MTIxMzU2MDRaMDUxCzAJBgNVBAYTAlVTMRIw
+EAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAxzlgJm5rZMTZEQCa7m3/JPbykh4FT7DwcrWBgDRF
+Jk0wgi4K7AKOFdCfOMqbW1Ps5ITbzgwq2yNXOrocKYs//02ewppKx5bxOE5wTA9v
+qwvaoJUeQ8PVEY+RVi2z+CP1xFIVKOCJtrg5WwWE9Vwvu3iyTe95dR1T95Hkrl0I
+yHECAwEAAaOBlzCBlDAdBgNVHQ4EFgQU/XO+9DMzOBifuZxp1BL+gTGVAwowZQYD
+VR0jBF4wXIAU/XO+9DMzOBifuZxp1BL+gTGVAwqhOaQ3MDUxCzAJBgNVBAYTAlVT
+MRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cIIJAO8E230u
+Baq+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAUxxR/7U35mIGJ7c/
+KfZZYze4/Aio7mf9QG0DA55F9DlB16IOJuRXqeMY2Lo+WFo7pszDX8TbucWtWJC6
+pMIVamWLTpgfVrWeTcafio/puqTALKfZ5LHzHieu1QNvFPQxMx1DZ5Eawowhl7ua
+4ERB9b/3K4StZjMUkPmBolSIkPo=
+-----END CERTIFICATE-----
diff --git a/orbsvcs/tests/Security/cert/client_cert.pem b/orbsvcs/tests/Security/cert/client_cert.pem
new file mode 100644
index 00000000000..b86bd5de1d2
--- /dev/null
+++ b/orbsvcs/tests/Security/cert/client_cert.pem
@@ -0,0 +1,59 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 4097 (0x1001)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Tennessee, O=DOC Group
+        Validity
+            Not Before: Jun 15 14:01:34 2011 GMT
+            Not After : May 25 14:01:34 2032 GMT
+        Subject: C=US, ST=Tennessee, O=DOC Group, CN=Build Czar Client
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:cf:7f:8e:42:bf:bb:c0:a6:23:7e:07:a4:13:ba:
+                    b6:ba:cd:4c:ed:c4:9c:97:46:32:dc:d5:e9:63:59:
+                    59:b8:7c:0d:7a:97:ad:3f:29:dd:fc:40:4e:48:cc:
+                    b2:1b:15:c4:98:59:a8:b0:b0:38:23:d2:d8:81:22:
+                    27:1b:77:64:d6:40:c0:02:41:b6:db:a8:25:4d:c6:
+                    a1:f5:03:f6:fa:8a:d3:1c:b5:a4:a9:4c:a5:62:19:
+                    89:e3:dc:d8:ac:68:47:96:0f:3c:10:1a:ec:00:81:
+                    10:aa:13:3d:99:48:3a:ae:2b:ac:b9:de:5b:20:7c:
+                    06:4e:57:64:af:2d:b3:88:ef
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                6F:13:BA:8B:91:ED:FA:22:DC:28:26:D4:74:5C:46:A7:B2:B2:A9:10
+            X509v3 Authority Key Identifier: 
+                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
+
+    Signature Algorithm: sha1WithRSAEncryption
+        bc:6f:d5:c7:68:a0:3c:8d:3a:39:61:ff:50:80:c7:a3:b9:28:
+        aa:c8:7b:7e:2d:af:26:e1:0a:39:94:9d:a8:94:c8:cd:82:f5:
+        a5:fc:d1:df:3d:3f:55:c7:5b:f9:89:14:78:59:d6:64:2d:32:
+        42:23:d9:96:9c:50:34:d2:81:17:e3:cc:09:57:13:fc:ae:3b:
+        ed:ff:55:03:d5:c2:dd:a5:5a:f1:c5:66:55:9f:a2:77:74:2f:
+        76:84:93:7c:03:b9:c1:9f:df:41:20:06:57:e4:e2:eb:e7:10:
+        67:42:63:02:d1:a8:53:f1:4d:9b:91:71:37:e4:c2:02:dd:e1:
+        b9:04
+-----BEGIN CERTIFICATE-----
+MIICeDCCAeGgAwIBAgICEAEwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
+EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
+NTE0MDEzNFoXDTMyMDUyNTE0MDEzNFowUTELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
+CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMRowGAYDVQQDExFCdWlsZCBD
+emFyIENsaWVudDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAz3+OQr+7wKYj
+fgekE7q2us1M7cScl0Yy3NXpY1lZuHwNepetPynd/EBOSMyyGxXEmFmosLA4I9LY
+gSInG3dk1kDAAkG226glTcah9QP2+orTHLWkqUylYhmJ49zYrGhHlg88EBrsAIEQ
+qhM9mUg6riusud5bIHwGTldkry2ziO8CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglg
+hkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0O
+BBYEFG8TuouR7foi3Cgm1HRcRqeysqkQMB8GA1UdIwQYMBaAFP1zvvQzMzgYn7mc
+adQS/oExlQMKMA0GCSqGSIb3DQEBBQUAA4GBALxv1cdooDyNOjlh/1CAx6O5KKrI
+e34trybhCjmUnaiUyM2C9aX80d89P1XHW/mJFHhZ1mQtMkIj2ZacUDTSgRfjzAlX
+E/yuO+3/VQPVwt2lWvHFZlWfond0L3aEk3wDucGf30EgBlfk4uvnEGdCYwLRqFPx
+TZuRcTfkwgLd4bkE
+-----END CERTIFICATE-----
diff --git a/orbsvcs/tests/Security/cert/client_key.pem b/orbsvcs/tests/Security/cert/client_key.pem
new file mode 100644
index 00000000000..e761037f237
--- /dev/null
+++ b/orbsvcs/tests/Security/cert/client_key.pem
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQDPf45Cv7vApiN+B6QTura6zUztxJyXRjLc1eljWVm4fA16l60/
+Kd38QE5IzLIbFcSYWaiwsDgj0tiBIicbd2TWQMACQbbbqCVNxqH1A/b6itMctaSp
+TKViGYnj3NisaEeWDzwQGuwAgRCqEz2ZSDquK6y53lsgfAZOV2SvLbOI7wIDAQAB
+AoGACTQ0QDu2/U2hR2bZXVKr5k9S+Tz+YSto+Ci46II/G5LNGkH+Gk4mHZlQn6QM
+xmzJwqQ/ek7mvpgMqHW2XF6IZ3AUmgNqpKdkFMbmkRworAEGRHvJcXy6RhiZI4kv
+UQWc9qEBA6/iR/B0sGsCgTTkv4davCs+5You5+oSyRiRu7kCQQDuQTkSkNm7fwFS
+lrEGmJjzJ3gXMHuv/lL2n2HJV67BBv7Aq7JDdciVLr90chcmXkIwPCywbdWVV9jz
+HWQ6GXKTAkEA3vPm3CKRHMFoSGwiX6qhM2432yLIlpjlfmSj3S6LnhhTJhYS6KMO
+6Ddv4vZ20zl3r4GAaXOyMTtZ6vQlZ8W9tQJBAMvRAAHh6GF9RKRiRQ5ffHiGSzWL
+RERKTK6tqfmUCOsYENbCCr2rBOyaES6Ma0FnYTfiQlirnQslG3Lesd8B5gECQQDS
+FG6PNP8ZYmDaBRJqpIQayxtUoDT0OoPckgYZrvcd8/u9YoVUsfik9T+3U9dpdrgB
+JvyR4NOiMjOrAXyRiLEVAkA9DutrYXzznEAyOvEEtyK92Eb2oTpu1svzRATc/i0w
+UTwLkFi+1m24HJ5MIGyRTHsNj79lj5v5U91lGIINHXXU
+-----END RSA PRIVATE KEY-----
diff --git a/orbsvcs/tests/Security/cert/openssl.cnf b/orbsvcs/tests/Security/cert/openssl.cnf
new file mode 100644
index 00000000000..ad2ce678265
--- /dev/null
+++ b/orbsvcs/tests/Security/cert/openssl.cnf
@@ -0,0 +1,313 @@
+#
+# OpenSSL example configuration file.
+# This is mostly being used for generation of certificate requests.
+#
+
+# This definition stops the following lines choking if HOME isn't
+# defined.
+HOME			= .
+RANDFILE		= $ENV::HOME/.rnd
+
+# Extra OBJECT IDENTIFIER info:
+#oid_file		= $ENV::HOME/.oid
+oid_section		= new_oids
+
+# To use this configuration file with the "-extfile" option of the
+# "openssl x509" utility, name here the section containing the
+# X.509v3 extensions to use:
+# extensions		= 
+# (Alternatively, use a configuration file that has only
+# X.509v3 extensions in its main [= default] section.)
+
+[ new_oids ]
+
+# We can add new OIDs in here for use by 'ca' and 'req'.
+# Add a simple OID like this:
+# testoid1=1.2.3.4
+# Or use config file substitution like this:
+# testoid2=${testoid1}.5.6
+
+####################################################################
+[ ca ]
+default_ca	= CA_default		# The default ca section
+
+####################################################################
+[ CA_default ]
+
+dir		= ./DOCCA		# Where everything is kept
+certs		= $dir/certs		# Where the issued certs are kept
+crl_dir		= $dir/crl		# Where the issued crl are kept
+database	= $dir/index.txt	# database index file.
+#unique_subject	= no			# Set to 'no' to allow creation of
+					# several ctificates with same subject.
+new_certs_dir	= $dir/newcerts		# default place for new certs.
+
+certificate	= $dir/cacert.pem 	# The CA certificate
+serial		= $dir/serial 		# The current serial number
+crlnumber	= $dir/crlnumber	# the current crl number
+					# must be commented out to leave a V1 CRL
+crl		= $dir/crl.pem 		# The current CRL
+private_key	= $dir/private/cakey.pem# The private key
+RANDFILE	= $dir/private/.rand	# private random number file
+
+x509_extensions	= usr_cert		# The extentions to add to the cert
+
+# Comment out the following two lines for the "traditional"
+# (and highly broken) format.
+name_opt 	= ca_default		# Subject Name options
+cert_opt 	= ca_default		# Certificate field options
+
+# Extension copying option: use with caution.
+# copy_extensions = copy
+
+# Extensions to add to a CRL. Note: Netscape communicator chokes on V2 CRLs
+# so this is commented out by default to leave a V1 CRL.
+# crlnumber must also be commented out to leave a V1 CRL.
+# crl_extensions	= crl_ext
+
+default_days	= 7650			# how long to certify for
+default_crl_days= 30			# how long before next CRL
+default_md	= sha1			# which md to use.
+preserve	= no			# keep passed DN ordering
+
+# A few difference way of specifying how similar the request should look
+# For type CA, the listed attributes must be the same, and the optional
+# and supplied fields are just that :-)
+policy		= policy_match
+
+# For the CA policy
+[ policy_match ]
+countryName		= match
+stateOrProvinceName	= match
+organizationName	= match
+organizationalUnitName	= optional
+commonName		= supplied
+emailAddress		= optional
+
+# For the 'anything' policy
+# At this point in time, you must list all acceptable 'object'
+# types.
+[ policy_anything ]
+countryName		= optional
+stateOrProvinceName	= optional
+localityName		= optional
+organizationName	= optional
+organizationalUnitName	= optional
+commonName		= supplied
+emailAddress		= optional
+
+####################################################################
+[ req ]
+default_bits		= 1024
+default_keyfile 	= privkey.pem
+distinguished_name	= req_distinguished_name
+attributes		= req_attributes
+x509_extensions	= v3_ca	# The extentions to add to the self signed cert
+
+# Passwords for private keys if not present they will be prompted for
+# input_password = secret
+# output_password = secret
+
+# This sets a mask for permitted string types. There are several options. 
+# default: PrintableString, T61String, BMPString.
+# pkix	 : PrintableString, BMPString.
+# utf8only: only UTF8Strings.
+# nombstr : PrintableString, T61String (no BMPStrings or UTF8Strings).
+# MASK:XXXX a literal mask value.
+# WARNING: current versions of Netscape crash on BMPStrings or UTF8Strings
+# so use this option with caution!
+string_mask = nombstr
+
+# req_extensions = v3_req # The extensions to add to a certificate request
+
+[ req_distinguished_name ]
+countryName			= Country Name (2 letter code)
+countryName_default		= US
+countryName_min			= 2
+countryName_max			= 2
+
+stateOrProvinceName		= State or Province Name (full name)
+stateOrProvinceName_default	= Tennessee
+
+localityName			= Nashville
+
+0.organizationName		= Institute for Software Integrated Systems
+0.organizationName_default	= DOC Group
+
+# we can do this but it is not needed normally :-)
+#1.organizationName		= Second Organization Name (eg, company)
+#1.organizationName_default	= World Wide Web Pty Ltd
+
+organizationalUnitName		= DOC Group
+#organizationalUnitName_default	=
+
+commonName			= DOC Group Build Czar
+commonName_max			= 64
+
+emailAddress			= bczar@dre.vanderbilt.edu
+emailAddress_max		= 64
+
+# SET-ex3			= SET extension number 3
+
+[ req_attributes ]
+challengePassword		= DOCGroup
+challengePassword_min		= 4
+challengePassword_max		= 20
+
+unstructuredName		= DOC Group
+
+[ usr_cert ]
+
+# These extensions are added when 'ca' signs a request.
+
+# This goes against PKIX guidelines but some CAs do it and some software
+# requires this to avoid interpreting an end user certificate as a CA.
+
+basicConstraints=CA:FALSE
+
+# Here are some examples of the usage of nsCertType. If it is omitted
+# the certificate can be used for anything *except* object signing.
+
+# This is OK for an SSL server.
+# nsCertType			= server
+
+# For an object signing certificate this would be used.
+# nsCertType = objsign
+
+# For normal client use this is typical
+# nsCertType = client, email
+
+# and for everything including object signing:
+# nsCertType = client, email, objsign
+
+# This is typical in keyUsage for a client certificate.
+# keyUsage = nonRepudiation, digitalSignature, keyEncipherment
+
+# This will be displayed in Netscape's comment listbox.
+nsComment			= "OpenSSL Generated Certificate"
+
+# PKIX recommendations harmless if included in all certificates.
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid,issuer
+
+# This stuff is for subjectAltName and issuerAltname.
+# Import the email address.
+# subjectAltName=email:copy
+# An alternative to produce certificates that aren't
+# deprecated according to PKIX.
+# subjectAltName=email:move
+
+# Copy subject details
+# issuerAltName=issuer:copy
+
+#nsCaRevocationUrl		= http://www.domain.dom/ca-crl.pem
+#nsBaseUrl
+#nsRevocationUrl
+#nsRenewalUrl
+#nsCaPolicyUrl
+#nsSslServerName
+
+[ v3_req ]
+
+# Extensions to add to a certificate request
+
+basicConstraints = CA:FALSE
+keyUsage = nonRepudiation, digitalSignature, keyEncipherment
+
+[ v3_ca ]
+
+
+# Extensions for a typical CA
+
+
+# PKIX recommendation.
+
+subjectKeyIdentifier=hash
+
+authorityKeyIdentifier=keyid:always,issuer:always
+
+# This is what PKIX recommends but some broken software chokes on critical
+# extensions.
+#basicConstraints = critical,CA:true
+# So we do this instead.
+basicConstraints = CA:true
+
+# Key usage: this is typical for a CA certificate. However since it will
+# prevent it being used as an test self-signed certificate it is best
+# left out by default.
+# keyUsage = cRLSign, keyCertSign
+
+# Some might want this also
+# nsCertType = sslCA, emailCA
+
+# Include email address in subject alt name: another PKIX recommendation
+# subjectAltName=email:copy
+# Copy issuer details
+# issuerAltName=issuer:copy
+
+# DER hex encoding of an extension: beware experts only!
+# obj=DER:02:03
+# Where 'obj' is a standard or added object
+# You can even override a supported extension:
+# basicConstraints= critical, DER:30:03:01:01:FF
+
+[ crl_ext ]
+
+# CRL extensions.
+# Only issuerAltName and authorityKeyIdentifier make any sense in a CRL.
+
+# issuerAltName=issuer:copy
+authorityKeyIdentifier=keyid:always,issuer:always
+
+[ proxy_cert_ext ]
+# These extensions should be added when creating a proxy certificate
+
+# This goes against PKIX guidelines but some CAs do it and some software
+# requires this to avoid interpreting an end user certificate as a CA.
+
+basicConstraints=CA:FALSE
+
+# Here are some examples of the usage of nsCertType. If it is omitted
+# the certificate can be used for anything *except* object signing.
+
+# This is OK for an SSL server.
+# nsCertType			= server
+
+# For an object signing certificate this would be used.
+# nsCertType = objsign
+
+# For normal client use this is typical
+# nsCertType = client, email
+
+# and for everything including object signing:
+# nsCertType = client, email, objsign
+
+# This is typical in keyUsage for a client certificate.
+# keyUsage = nonRepudiation, digitalSignature, keyEncipherment
+
+# This will be displayed in Netscape's comment listbox.
+nsComment			= "OpenSSL Generated Certificate"
+
+# PKIX recommendations harmless if included in all certificates.
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid,issuer:always
+
+# This stuff is for subjectAltName and issuerAltname.
+# Import the email address.
+# subjectAltName=email:copy
+# An alternative to produce certificates that aren't
+# deprecated according to PKIX.
+# subjectAltName=email:move
+
+# Copy subject details
+# issuerAltName=issuer:copy
+
+#nsCaRevocationUrl		= http://www.domain.dom/ca-crl.pem
+#nsBaseUrl
+#nsRevocationUrl
+#nsRenewalUrl
+#nsCaPolicyUrl
+#nsSslServerName
+
+# This really needs to be in place for it to be a proxy certificate.
+proxyCertInfo=critical,language:id-ppl-anyLanguage,pathlen:3,policy:foo
diff --git a/orbsvcs/tests/Security/cert/server_cert.pem b/orbsvcs/tests/Security/cert/server_cert.pem
new file mode 100644
index 00000000000..5402ae2497a
--- /dev/null
+++ b/orbsvcs/tests/Security/cert/server_cert.pem
@@ -0,0 +1,59 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 4096 (0x1000)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Tennessee, O=DOC Group
+        Validity
+            Not Before: Jun 15 14:01:15 2011 GMT
+            Not After : May 25 14:01:15 2032 GMT
+        Subject: C=US, ST=Tennessee, O=DOC Group, CN=DOC Group Build Czar Server
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:b2:03:27:b9:d6:24:a4:6d:e1:9f:0e:d7:8a:71:
+                    86:62:df:2b:f8:64:3b:51:53:e0:fa:71:9a:c2:10:
+                    40:97:bd:06:27:43:5a:1a:1c:62:f4:ca:3e:b3:b9:
+                    20:16:89:a2:aa:2e:1e:97:3a:70:3d:fe:f7:ff:ba:
+                    d5:1e:b2:68:07:7e:d0:68:18:8a:3b:aa:9c:01:0e:
+                    1e:ef:b5:97:96:d5:0b:a5:a0:fd:a3:02:21:b5:5a:
+                    6f:e4:c1:36:bf:61:7b:40:ac:73:03:3d:40:75:e7:
+                    9d:ba:22:ab:95:81:8b:74:9e:fa:df:27:18:a7:7f:
+                    23:83:36:f0:15:22:22:db:7b
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                0C:27:05:12:9B:D5:4B:F9:43:32:6B:77:7B:A2:0D:34:7F:6C:0A:BC
+            X509v3 Authority Key Identifier: 
+                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
+
+    Signature Algorithm: sha1WithRSAEncryption
+        0d:bf:65:2a:a5:02:75:6c:c4:5a:3c:1d:3c:25:51:16:1a:f8:
+        78:ad:49:f6:f4:a4:c1:97:e4:c8:0b:ac:9e:71:0e:be:1e:e6:
+        1d:2e:c7:d2:4f:1e:e8:c7:21:7c:58:27:0e:6d:93:11:7e:64:
+        24:57:44:c1:c1:5a:d0:76:82:79:70:82:36:06:f2:48:60:e8:
+        6a:20:a7:92:09:00:73:75:b2:f9:cb:97:35:d6:aa:8e:87:11:
+        20:e2:dd:8a:c3:9c:c4:aa:f0:57:04:4e:e2:b3:8b:fb:9a:4f:
+        4b:60:b7:2e:3b:89:98:38:02:25:24:ff:b1:f1:c0:ad:01:eb:
+        37:bd
+-----BEGIN CERTIFICATE-----
+MIICgjCCAeugAwIBAgICEAAwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
+EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
+NTE0MDExNVoXDTMyMDUyNTE0MDExNVowWzELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
+CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMSQwIgYDVQQDExtET0MgR3Jv
+dXAgQnVpbGQgQ3phciBTZXJ2ZXIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
+ALIDJ7nWJKRt4Z8O14pxhmLfK/hkO1FT4PpxmsIQQJe9BidDWhocYvTKPrO5IBaJ
+oqouHpc6cD3+9/+61R6yaAd+0GgYijuqnAEOHu+1l5bVC6Wg/aMCIbVab+TBNr9h
+e0CscwM9QHXnnboiq5WBi3Se+t8nGKd/I4M28BUiItt7AgMBAAGjezB5MAkGA1Ud
+EwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmlj
+YXRlMB0GA1UdDgQWBBQMJwUSm9VL+UMya3d7og00f2wKvDAfBgNVHSMEGDAWgBT9
+c770MzM4GJ+5nGnUEv6BMZUDCjANBgkqhkiG9w0BAQUFAAOBgQANv2UqpQJ1bMRa
+PB08JVEWGvh4rUn29KTBl+TIC6yecQ6+HuYdLsfSTx7oxyF8WCcObZMRfmQkV0TB
+wVrQdoJ5cII2BvJIYOhqIKeSCQBzdbL5y5c11qqOhxEg4t2Kw5zEqvBXBE7is4v7
+mk9LYLcuO4mYOAIlJP+x8cCtAes3vQ==
+-----END CERTIFICATE-----
diff --git a/orbsvcs/tests/Security/cert/server_key.pem b/orbsvcs/tests/Security/cert/server_key.pem
new file mode 100644
index 00000000000..be238899a9f
--- /dev/null
+++ b/orbsvcs/tests/Security/cert/server_key.pem
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXgIBAAKBgQCyAye51iSkbeGfDteKcYZi3yv4ZDtRU+D6cZrCEECXvQYnQ1oa
+HGL0yj6zuSAWiaKqLh6XOnA9/vf/utUesmgHftBoGIo7qpwBDh7vtZeW1QuloP2j
+AiG1Wm/kwTa/YXtArHMDPUB15526IquVgYt0nvrfJxinfyODNvAVIiLbewIDAQAB
+AoGAMV1KoPBPjQGjtbYp84xz1etJiEJTaMQ3+XuTjQlwwCN9F1pIHEGO9482QCSw
+T0+vuj274fgktCyGnXY0L6UNz7+0wNhUj5oP2IeJdmgcJbv9tcR126rhryr4bx6H
+2sZdLL4MtxjzRNkURS748zeGET/NuIhpQ4YjnUJ27YOeNtECQQDiItcRkyfMcj+r
+/8JU8h9ifOV5tMOyPV4z6Hfli1X+Xa1OcIieE2nzkaa9LHPEi3+LNw41LItUDbMZ
+/Aztm4VVAkEAyYVbbbebVrgoOF7ueafHZeNToc96FEn04H+tN8AgwaI4+U1Q7oga
+EAjVD++e0NfUUJpeyiygBa9NlzB9XYXdjwJBAJobUCHD/R1Qxp96fn7ROh4uK1xT
+mgG/3JDXXc3qtMHSKScJfbDsXgoFOnI09vf8cQD4lhAauSCg7WtJ362VjLkCQQCu
+eVRoUNAgK78+1wo3sAiWcVRGQyDaEhH+kOxC2YhCvZYAWm1Yp+OQwGTfsEHbZRIA
+Wzb4adx+L4HJBYV1BGKHAkEAvSCAANbm8iaLkCG4EfEyrhIpbJDY2Cx3WO08+ZOz
+ekMspMikGmMQfXXroBpnJ8SGVLYSjf2hQQySwDa00hmyBA==
+-----END RSA PRIVATE KEY-----
diff --git a/orbsvcs/tests/Security/mixed_security_test/cacert.pem b/orbsvcs/tests/Security/mixed_security_test/cacert.pem
index a9e905f4e6c..d98dd5918cb 100644
--- a/orbsvcs/tests/Security/mixed_security_test/cacert.pem
+++ b/orbsvcs/tests/Security/mixed_security_test/cacert.pem
@@ -1,21 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIIDfTCCAuagAwIBAgIBADANBgkqhkiG9w0BAQQFADCBjDELMAkGA1UEBhMCVVMx
-CzAJBgNVBAgTAkNBMQ8wDQYDVQQHEwZJcnZpbmUxEjAQBgNVBAoTCURPQyBHcm91
-cDEQMA4GA1UECxYHVUNJX0RPQzERMA8GA1UEAxMIUHJpeWFua2ExJjAkBgkqhkiG
-9w0BCQEWF3Bnb250bGFAZG9jLmVjZS51Y2kuZWR1MB4XDTAxMDYxMTE3MjI0MVoX
-DTExMDYwOTE3MjI0MVowgYwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEPMA0G
-A1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAOBgNVBAsWB1VDSV9E
-T0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkBFhdwZ29udGxhQGRv
-Yy5lY2UudWNpLmVkdTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyFiCRDUH
-nGJqQG9jT/2PhZUAgfwXvIwfDM8m/WujCt/buDcrOz767shBsk4HZhW91Vm4mE03
-K1zfCzojRigf28uyB/rlp60p2Fq0wvZBNNU5Muia6esleR4unb4QslOpcFhct/9n
-UPnlnnsZOTaGWaELNKEjYfHqPh8PQ0lYurECAwEAAaOB7DCB6TAdBgNVHQ4EFgQU
-0Y6IZjkLbLbtZ5aoKLcfd7Yc/kYwgbkGA1UdIwSBsTCBroAU0Y6IZjkLbLbtZ5ao
-KLcfd7Yc/kahgZKkgY8wgYwxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEPMA0G
-A1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAOBgNVBAsWB1VDSV9E
-T0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkBFhdwZ29udGxhQGRv
-Yy5lY2UudWNpLmVkdYIBADAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4GB
-AHYi8ulIzUI3p3+Ma16rumZxvKcmkJJbU6fpAv4ZvK6AWyy+6Ja0GD5N3SGEx+xU
-nMffTR+LePa9PAZiR7dNkF6ikPxXZu4jn8KY2zFT3SB/VjCoEetR9i9QI//O0Fea
-3yZ0NygNWe5cyVDLCb4meucJpsClfyL28DWzMwD2liX3
+MIICgDCCAemgAwIBAgIJAO8E230uBaq+MA0GCSqGSIb3DQEBBQUAMDUxCzAJBgNV
+BAYTAlVTMRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDAe
+Fw0xMTA2MTUxMzU2MDRaFw0yMTA2MTIxMzU2MDRaMDUxCzAJBgNVBAYTAlVTMRIw
+EAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAxzlgJm5rZMTZEQCa7m3/JPbykh4FT7DwcrWBgDRF
+Jk0wgi4K7AKOFdCfOMqbW1Ps5ITbzgwq2yNXOrocKYs//02ewppKx5bxOE5wTA9v
+qwvaoJUeQ8PVEY+RVi2z+CP1xFIVKOCJtrg5WwWE9Vwvu3iyTe95dR1T95Hkrl0I
+yHECAwEAAaOBlzCBlDAdBgNVHQ4EFgQU/XO+9DMzOBifuZxp1BL+gTGVAwowZQYD
+VR0jBF4wXIAU/XO+9DMzOBifuZxp1BL+gTGVAwqhOaQ3MDUxCzAJBgNVBAYTAlVT
+MRIwEAYDVQQIEwlUZW5uZXNzZWUxEjAQBgNVBAoTCURPQyBHcm91cIIJAO8E230u
+Baq+MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAUxxR/7U35mIGJ7c/
+KfZZYze4/Aio7mf9QG0DA55F9DlB16IOJuRXqeMY2Lo+WFo7pszDX8TbucWtWJC6
+pMIVamWLTpgfVrWeTcafio/puqTALKfZ5LHzHieu1QNvFPQxMx1DZ5Eawowhl7ua
+4ERB9b/3K4StZjMUkPmBolSIkPo=
 -----END CERTIFICATE-----
diff --git a/orbsvcs/tests/Security/mixed_security_test/client_cert.pem b/orbsvcs/tests/Security/mixed_security_test/client_cert.pem
index 0bebb696cfc..b86bd5de1d2 100644
--- a/orbsvcs/tests/Security/mixed_security_test/client_cert.pem
+++ b/orbsvcs/tests/Security/mixed_security_test/client_cert.pem
@@ -1,16 +1,59 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 4097 (0x1001)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Tennessee, O=DOC Group
+        Validity
+            Not Before: Jun 15 14:01:34 2011 GMT
+            Not After : May 25 14:01:34 2032 GMT
+        Subject: C=US, ST=Tennessee, O=DOC Group, CN=Build Czar Client
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:cf:7f:8e:42:bf:bb:c0:a6:23:7e:07:a4:13:ba:
+                    b6:ba:cd:4c:ed:c4:9c:97:46:32:dc:d5:e9:63:59:
+                    59:b8:7c:0d:7a:97:ad:3f:29:dd:fc:40:4e:48:cc:
+                    b2:1b:15:c4:98:59:a8:b0:b0:38:23:d2:d8:81:22:
+                    27:1b:77:64:d6:40:c0:02:41:b6:db:a8:25:4d:c6:
+                    a1:f5:03:f6:fa:8a:d3:1c:b5:a4:a9:4c:a5:62:19:
+                    89:e3:dc:d8:ac:68:47:96:0f:3c:10:1a:ec:00:81:
+                    10:aa:13:3d:99:48:3a:ae:2b:ac:b9:de:5b:20:7c:
+                    06:4e:57:64:af:2d:b3:88:ef
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                6F:13:BA:8B:91:ED:FA:22:DC:28:26:D4:74:5C:46:A7:B2:B2:A9:10
+            X509v3 Authority Key Identifier: 
+                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
+
+    Signature Algorithm: sha1WithRSAEncryption
+        bc:6f:d5:c7:68:a0:3c:8d:3a:39:61:ff:50:80:c7:a3:b9:28:
+        aa:c8:7b:7e:2d:af:26:e1:0a:39:94:9d:a8:94:c8:cd:82:f5:
+        a5:fc:d1:df:3d:3f:55:c7:5b:f9:89:14:78:59:d6:64:2d:32:
+        42:23:d9:96:9c:50:34:d2:81:17:e3:cc:09:57:13:fc:ae:3b:
+        ed:ff:55:03:d5:c2:dd:a5:5a:f1:c5:66:55:9f:a2:77:74:2f:
+        76:84:93:7c:03:b9:c1:9f:df:41:20:06:57:e4:e2:eb:e7:10:
+        67:42:63:02:d1:a8:53:f1:4d:9b:91:71:37:e4:c2:02:dd:e1:
+        b9:04
 -----BEGIN CERTIFICATE-----
-MIICgzCCAewCAQYwDQYJKoZIhvcNAQEEBQAwgYwxCzAJBgNVBAYTAlVTMQswCQYD
-VQQIEwJDQTEPMA0GA1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAO
-BgNVBAsWB1VDSV9ET0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkB
-FhdwZ29udGxhQGRvYy5lY2UudWNpLmVkdTAeFw0wMTA2MTExODEwMzRaFw0xMTA2
-MDkxODEwMzRaMIGGMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExDzANBgNVBAcT
-BklydmluZTEQMA4GA1UEChMHVEFPK09DSTEMMAoGA1UECxMDT0NJMREwDwYDVQQD
-EwhQcml5YW5rYTEmMCQGCSqGSIb3DQEJARYXcGdvbnRsYUBkb2MuZWNlLnVjaS5l
-ZHUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL6f8pBX7Mi3FPY/OYBOq+kb
-wQ3WX0Z8+nDxd7AiWDAx2AL5EaX8xnUiRi96OJ+CYPCYOUlavGVzZkRVMFdOuHAn
-RvY2sCpvU2rkKpEx9Pd50l7FLnXJuflnRc6zIEKOvuQcPJvsP4AaxaFxTnZExXQJ
-kDEiQP3mGID/eXtUzywbAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAuvSoOnMB6sxj
-ft9YbdLeyATTPzHbxAb6zQo72DUmM3roNowUrefHymU8jZoC6HeaROeKCU0MkVes
-l/jYlz/OwSYkbyGNIUkq4DHEWKzXEg8M603fsWK6IK3T5iPBHY+l/mYSEHJPfypZ
-fl/y4YSNJZlrz6kCIHTcwfHXDRC1mjM=
+MIICeDCCAeGgAwIBAgICEAEwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
+EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
+NTE0MDEzNFoXDTMyMDUyNTE0MDEzNFowUTELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
+CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMRowGAYDVQQDExFCdWlsZCBD
+emFyIENsaWVudDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAz3+OQr+7wKYj
+fgekE7q2us1M7cScl0Yy3NXpY1lZuHwNepetPynd/EBOSMyyGxXEmFmosLA4I9LY
+gSInG3dk1kDAAkG226glTcah9QP2+orTHLWkqUylYhmJ49zYrGhHlg88EBrsAIEQ
+qhM9mUg6riusud5bIHwGTldkry2ziO8CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglg
+hkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0O
+BBYEFG8TuouR7foi3Cgm1HRcRqeysqkQMB8GA1UdIwQYMBaAFP1zvvQzMzgYn7mc
+adQS/oExlQMKMA0GCSqGSIb3DQEBBQUAA4GBALxv1cdooDyNOjlh/1CAx6O5KKrI
+e34trybhCjmUnaiUyM2C9aX80d89P1XHW/mJFHhZ1mQtMkIj2ZacUDTSgRfjzAlX
+E/yuO+3/VQPVwt2lWvHFZlWfond0L3aEk3wDucGf30EgBlfk4uvnEGdCYwLRqFPx
+TZuRcTfkwgLd4bkE
 -----END CERTIFICATE-----
diff --git a/orbsvcs/tests/Security/mixed_security_test/client_key.pem b/orbsvcs/tests/Security/mixed_security_test/client_key.pem
index 1428b501712..e761037f237 100644
--- a/orbsvcs/tests/Security/mixed_security_test/client_key.pem
+++ b/orbsvcs/tests/Security/mixed_security_test/client_key.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQC+n/KQV+zItxT2PzmATqvpG8EN1l9GfPpw8XewIlgwMdgC+RGl
-/MZ1IkYvejifgmDwmDlJWrxlc2ZEVTBXTrhwJ0b2NrAqb1Nq5CqRMfT3edJexS51
-ybn5Z0XOsyBCjr7kHDyb7D+AGsWhcU52RMV0CZAxIkD95hiA/3l7VM8sGwIDAQAB
-AoGABGaa6fwtqkCXykuRX0XxsBME9PXTA0SVX5AjjDxuvsYXz5HCd4uLZV7iMexn
-bD9NT6CkCe5/VPRCEyfIUuutVFc7lkPwuRw5FvNcf4gMH9ltufQfH/KeR7d2Jvge
-zrTOH7nicshy67mfOEOaoDphWoT9uy+7ayym+EsJLJU37VkCQQD6xLRu5r9tKX2/
-NfIQsGxF3TZyXgxcuxMh9JOq5E9nBwhr1JaXDbXktXfIK/F3XWHLFS8CIg6PhgGY
-i/+UtGzvAkEAwpoHp89U2jLdVRoIcwy5o7Ocwk3HCXem3UgFWXzzunGM1x+ozDFA
-uo5nyXiAO6Buka9C2czje275kE18BbqLlQJBAMJNf/EeYdzXdVOfHPzJdlt72CAt
-ty5y1ZRNyc10MgIGdQP4KObJ/NJFuZYkVmjCtm+A7neco+OZVcs5TsOOOYkCQBHQ
-6EKEyM/xODJCX+OolpZWK1PeqwpC2hQIM/Uta2L2Yl6Pl3SaTcLGptnbHmJXHchY
-s1YdW/ZBArgjX+dmXMECQApTKWbVLmNsEoOlHU/I/KhGsfuojrzBMMe3FKLiHpmu
-u86L3vu3OGZFcPgjazxWZcip8JekeJ7c+6suLNNRQ5I=
+MIICXQIBAAKBgQDPf45Cv7vApiN+B6QTura6zUztxJyXRjLc1eljWVm4fA16l60/
+Kd38QE5IzLIbFcSYWaiwsDgj0tiBIicbd2TWQMACQbbbqCVNxqH1A/b6itMctaSp
+TKViGYnj3NisaEeWDzwQGuwAgRCqEz2ZSDquK6y53lsgfAZOV2SvLbOI7wIDAQAB
+AoGACTQ0QDu2/U2hR2bZXVKr5k9S+Tz+YSto+Ci46II/G5LNGkH+Gk4mHZlQn6QM
+xmzJwqQ/ek7mvpgMqHW2XF6IZ3AUmgNqpKdkFMbmkRworAEGRHvJcXy6RhiZI4kv
+UQWc9qEBA6/iR/B0sGsCgTTkv4davCs+5You5+oSyRiRu7kCQQDuQTkSkNm7fwFS
+lrEGmJjzJ3gXMHuv/lL2n2HJV67BBv7Aq7JDdciVLr90chcmXkIwPCywbdWVV9jz
+HWQ6GXKTAkEA3vPm3CKRHMFoSGwiX6qhM2432yLIlpjlfmSj3S6LnhhTJhYS6KMO
+6Ddv4vZ20zl3r4GAaXOyMTtZ6vQlZ8W9tQJBAMvRAAHh6GF9RKRiRQ5ffHiGSzWL
+RERKTK6tqfmUCOsYENbCCr2rBOyaES6Ma0FnYTfiQlirnQslG3Lesd8B5gECQQDS
+FG6PNP8ZYmDaBRJqpIQayxtUoDT0OoPckgYZrvcd8/u9YoVUsfik9T+3U9dpdrgB
+JvyR4NOiMjOrAXyRiLEVAkA9DutrYXzznEAyOvEEtyK92Eb2oTpu1svzRATc/i0w
+UTwLkFi+1m24HJ5MIGyRTHsNj79lj5v5U91lGIINHXXU
 -----END RSA PRIVATE KEY-----
diff --git a/orbsvcs/tests/Security/mixed_security_test/client_key_nopasswd.pem b/orbsvcs/tests/Security/mixed_security_test/client_key_nopasswd.pem
deleted file mode 100644
index 35e449a2493..00000000000
--- a/orbsvcs/tests/Security/mixed_security_test/client_key_nopasswd.pem
+++ /dev/null
@@ -1,16 +0,0 @@
-RSA key ok
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDBuQXJQhW75XZJfatysGHE3/RXFeMSB8TOk/geXhlUAQTaHj/0
-+eQLNnz2ed8XFoyZFJYioUrcAHyC3LGv7CemhPAW0ZEBgXG8QX1eG8T+NlPh5pC8
-pMg8R67aVr/Rs3jvXsh7lI5rqCQ6Mr1fCg6qVdnJyH04gKKv4b0Iu29FDQIDAQAB
-AoGADRU7yM3HvfrPNENicspqr+sYC1GVFkCkD/d6SEK+nye6diiY1SiTOBaj9dlh
-MaP6NtRnF0uhTJ5TylqxPVpLixs6Dot/lX0Mu/bD80Zez1bWdQFivszOcDnxylHX
-j4z3Sv5nSPWoOgssDVxWNpI9QHcC2E7zII094drJEG/UZIECQQDy0axJBAahSgMX
-9CfpWJjXEMKD58RwddbiS2tGboLzdYXUVaE1qr4GN70jypGC4HmWZ6XV5HX4+fy3
-QltXF3GdAkEAzD0VpmOCan7jLty6+qklEwpyzMDJ9VH9QwfMyS5oSO4Dh08lC6WT
-Ss+nQlXFwFYszKxd6kznEECGPlKybiC+MQJBANFdsKuUaRMQ+fHhd7hfyAlITi/l
-2x8MvCeK2Ah2qTq6jpYy7zmS6x35WYBO3YB3hN8Gp5rxzjbLdfedo5xIfpECQGkk
-ASM5EwhT7gxP4YnszYMx28uAa/d4j9KUD156H4F71iEwIzgNsvfOUqKZmUXclw9+
-pJJbqI/7R6CJ3gVHoeECQGpfgurJz2V5Z2/qsZIDJXgxFoW6vY9rZbZU80ZYx3Cb
-RINCjB0G0ThsqH7FqCC3PAkEt0xThXqT2SM8ezVlENM=
------END RSA PRIVATE KEY-----
diff --git a/orbsvcs/tests/Security/mixed_security_test/server_cert.pem b/orbsvcs/tests/Security/mixed_security_test/server_cert.pem
index 0fc394c24d7..5402ae2497a 100644
--- a/orbsvcs/tests/Security/mixed_security_test/server_cert.pem
+++ b/orbsvcs/tests/Security/mixed_security_test/server_cert.pem
@@ -1,16 +1,59 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 4096 (0x1000)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Tennessee, O=DOC Group
+        Validity
+            Not Before: Jun 15 14:01:15 2011 GMT
+            Not After : May 25 14:01:15 2032 GMT
+        Subject: C=US, ST=Tennessee, O=DOC Group, CN=DOC Group Build Czar Server
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (1024 bit)
+                Modulus (1024 bit):
+                    00:b2:03:27:b9:d6:24:a4:6d:e1:9f:0e:d7:8a:71:
+                    86:62:df:2b:f8:64:3b:51:53:e0:fa:71:9a:c2:10:
+                    40:97:bd:06:27:43:5a:1a:1c:62:f4:ca:3e:b3:b9:
+                    20:16:89:a2:aa:2e:1e:97:3a:70:3d:fe:f7:ff:ba:
+                    d5:1e:b2:68:07:7e:d0:68:18:8a:3b:aa:9c:01:0e:
+                    1e:ef:b5:97:96:d5:0b:a5:a0:fd:a3:02:21:b5:5a:
+                    6f:e4:c1:36:bf:61:7b:40:ac:73:03:3d:40:75:e7:
+                    9d:ba:22:ab:95:81:8b:74:9e:fa:df:27:18:a7:7f:
+                    23:83:36:f0:15:22:22:db:7b
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                0C:27:05:12:9B:D5:4B:F9:43:32:6B:77:7B:A2:0D:34:7F:6C:0A:BC
+            X509v3 Authority Key Identifier: 
+                keyid:FD:73:BE:F4:33:33:38:18:9F:B9:9C:69:D4:12:FE:81:31:95:03:0A
+
+    Signature Algorithm: sha1WithRSAEncryption
+        0d:bf:65:2a:a5:02:75:6c:c4:5a:3c:1d:3c:25:51:16:1a:f8:
+        78:ad:49:f6:f4:a4:c1:97:e4:c8:0b:ac:9e:71:0e:be:1e:e6:
+        1d:2e:c7:d2:4f:1e:e8:c7:21:7c:58:27:0e:6d:93:11:7e:64:
+        24:57:44:c1:c1:5a:d0:76:82:79:70:82:36:06:f2:48:60:e8:
+        6a:20:a7:92:09:00:73:75:b2:f9:cb:97:35:d6:aa:8e:87:11:
+        20:e2:dd:8a:c3:9c:c4:aa:f0:57:04:4e:e2:b3:8b:fb:9a:4f:
+        4b:60:b7:2e:3b:89:98:38:02:25:24:ff:b1:f1:c0:ad:01:eb:
+        37:bd
 -----BEGIN CERTIFICATE-----
-MIICgzCCAewCAQMwDQYJKoZIhvcNAQEEBQAwgYwxCzAJBgNVBAYTAlVTMQswCQYD
-VQQIEwJDQTEPMA0GA1UEBxMGSXJ2aW5lMRIwEAYDVQQKEwlET0MgR3JvdXAxEDAO
-BgNVBAsWB1VDSV9ET0MxETAPBgNVBAMTCFByaXlhbmthMSYwJAYJKoZIhvcNAQkB
-FhdwZ29udGxhQGRvYy5lY2UudWNpLmVkdTAeFw0wMTA2MTExNzQ4NTVaFw0xMTA2
-MDkxNzQ4NTVaMIGGMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExDzANBgNVBAcT
-BklydmluZTEMMAoGA1UEChMDT0NJMRAwDgYDVQQLEwdUQU8rT0NJMREwDwYDVQQD
-EwhQcml5YW5rYTEmMCQGCSqGSIb3DQEJARYXcGdvbnRsYUBkb2MuZWNlLnVjaS5l
-ZHUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANKXmudWiLVu/zdBlSr0/dlr
-pRe+Ie26cPyMo5lKiYNY77tABTiOXe5qLUEryjQ/fZ74gmBe4AYFwb7nu/f58X4A
-0tzSg2M4spWM7N4tzf+YbcUipRt9sEISxwfUxNNWTKnLxvCmkzOsISisukdzTkqJ
-fdzEcPfhO2BZKOdmlg1hAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAjUl3ami01tPY
-P1vMp2642dsIKLZis0TmeWp6HNpm52TbiGZOCqDrvtSQ9+2vGz0BkHvGqWKtD+wv
-zJH23fNnqFuzy1C1xtjoeqhXECTsWVTVdoEox8hSWxPiYRE2dioraZQQ5ENDosh+
-V9YcqJJpnKDUOSGVGuyaU7DpR8yK0pc=
+MIICgjCCAeugAwIBAgICEAAwDQYJKoZIhvcNAQEFBQAwNTELMAkGA1UEBhMCVVMx
+EjAQBgNVBAgTCVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMB4XDTExMDYx
+NTE0MDExNVoXDTMyMDUyNTE0MDExNVowWzELMAkGA1UEBhMCVVMxEjAQBgNVBAgT
+CVRlbm5lc3NlZTESMBAGA1UEChMJRE9DIEdyb3VwMSQwIgYDVQQDExtET0MgR3Jv
+dXAgQnVpbGQgQ3phciBTZXJ2ZXIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGB
+ALIDJ7nWJKRt4Z8O14pxhmLfK/hkO1FT4PpxmsIQQJe9BidDWhocYvTKPrO5IBaJ
+oqouHpc6cD3+9/+61R6yaAd+0GgYijuqnAEOHu+1l5bVC6Wg/aMCIbVab+TBNr9h
+e0CscwM9QHXnnboiq5WBi3Se+t8nGKd/I4M28BUiItt7AgMBAAGjezB5MAkGA1Ud
+EwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmlj
+YXRlMB0GA1UdDgQWBBQMJwUSm9VL+UMya3d7og00f2wKvDAfBgNVHSMEGDAWgBT9
+c770MzM4GJ+5nGnUEv6BMZUDCjANBgkqhkiG9w0BAQUFAAOBgQANv2UqpQJ1bMRa
+PB08JVEWGvh4rUn29KTBl+TIC6yecQ6+HuYdLsfSTx7oxyF8WCcObZMRfmQkV0TB
+wVrQdoJ5cII2BvJIYOhqIKeSCQBzdbL5y5c11qqOhxEg4t2Kw5zEqvBXBE7is4v7
+mk9LYLcuO4mYOAIlJP+x8cCtAes3vQ==
 -----END CERTIFICATE-----
diff --git a/orbsvcs/tests/Security/mixed_security_test/server_key.pem b/orbsvcs/tests/Security/mixed_security_test/server_key.pem
index 567a41da6dc..be238899a9f 100644
--- a/orbsvcs/tests/Security/mixed_security_test/server_key.pem
+++ b/orbsvcs/tests/Security/mixed_security_test/server_key.pem
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDSl5rnVoi1bv83QZUq9P3Za6UXviHtunD8jKOZSomDWO+7QAU4
-jl3uai1BK8o0P32e+IJgXuAGBcG+57v3+fF+ANLc0oNjOLKVjOzeLc3/mG3FIqUb
-fbBCEscH1MTTVkypy8bwppMzrCEorLpHc05KiX3cxHD34TtgWSjnZpYNYQIDAQAB
-AoGAC/TxpZrjLjH8KZ3+oy6/zv1upTd1Y7MHQT+W9lgmEKAXFHGhGkHzEVtT8HRV
-CbxlHIaNmH0qiQ0AoB82K/E0BdIMvE+y2qQwlpMfBMX6/TACORReJN3NXGsXwHP4
-/pNlS4LX7/NZbxlReAlDNP+FO8sdKZTyM3VXHFWJbmm4wsECQQD06zQ4uthp0zI9
-WTZiiAUgYwOcnLnXwfWOLAr8RCnYgwiS7MBCcmhZAgWX5SZJYVCwEJ12DAHy02NJ
-EhiSgo+JAkEA3B7PcS5FqZFi6wVjEG6yF8OuSb/rl+FZfV6utZdCVdMPxacEVxlD
-q7H/dk23O4WwASBriU0PR9/KG3T/LvKBGQJAaYRn1EUTdcxKqcmkt6CYbNKbvL59
-BqqGq4DoHrUTPjd92ybq0fXOZQKM/Fr6OsUVaTVPUYtsz3wpG1MTiRN82QJACX6+
-vggb8yuVU8QAuPW9cu769q1zsTKEVLcf3C9xKhiXppQEyOkLFT3xYh4KGGQ06meG
-m/6Z+SS7KCIM2+6UCQJBANHIzgxDWtrLuWJviNh9EbCsdMioxBH+LGaqFKLC70xD
-Pyoqn+QJQu/ekT+FUb0BeFJfGPzFjh1mFYn4tXxWqMs=
+MIICXgIBAAKBgQCyAye51iSkbeGfDteKcYZi3yv4ZDtRU+D6cZrCEECXvQYnQ1oa
+HGL0yj6zuSAWiaKqLh6XOnA9/vf/utUesmgHftBoGIo7qpwBDh7vtZeW1QuloP2j
+AiG1Wm/kwTa/YXtArHMDPUB15526IquVgYt0nvrfJxinfyODNvAVIiLbewIDAQAB
+AoGAMV1KoPBPjQGjtbYp84xz1etJiEJTaMQ3+XuTjQlwwCN9F1pIHEGO9482QCSw
+T0+vuj274fgktCyGnXY0L6UNz7+0wNhUj5oP2IeJdmgcJbv9tcR126rhryr4bx6H
+2sZdLL4MtxjzRNkURS748zeGET/NuIhpQ4YjnUJ27YOeNtECQQDiItcRkyfMcj+r
+/8JU8h9ifOV5tMOyPV4z6Hfli1X+Xa1OcIieE2nzkaa9LHPEi3+LNw41LItUDbMZ
+/Aztm4VVAkEAyYVbbbebVrgoOF7ueafHZeNToc96FEn04H+tN8AgwaI4+U1Q7oga
+EAjVD++e0NfUUJpeyiygBa9NlzB9XYXdjwJBAJobUCHD/R1Qxp96fn7ROh4uK1xT
+mgG/3JDXXc3qtMHSKScJfbDsXgoFOnI09vf8cQD4lhAauSCg7WtJ362VjLkCQQCu
+eVRoUNAgK78+1wo3sAiWcVRGQyDaEhH+kOxC2YhCvZYAWm1Yp+OQwGTfsEHbZRIA
+Wzb4adx+L4HJBYV1BGKHAkEAvSCAANbm8iaLkCG4EfEyrhIpbJDY2Cx3WO08+ZOz
+ekMspMikGmMQfXXroBpnJ8SGVLYSjf2hQQySwDa00hmyBA==
 -----END RSA PRIVATE KEY-----
diff --git a/orbsvcs/tests/Security/mixed_security_test/server_key_nopasswd.pem b/orbsvcs/tests/Security/mixed_security_test/server_key_nopasswd.pem
deleted file mode 100644
index 2381bdcc6df..00000000000
--- a/orbsvcs/tests/Security/mixed_security_test/server_key_nopasswd.pem
+++ /dev/null
@@ -1,16 +0,0 @@
-RSA key ok
------BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQDOtfLxhcWktrjY/U9Mdsy9WaUeqFZGWkz2gknKMNrfJnKAdmuU
-RaP2G9X565FhgyrEpb5bYJUC3aTLhdr5NsDFt3V1hhs9rev6WSeONmiAlOrUrKCB
-cpF3K0HyU4bVp06/FgtWFUp8ja88B8zLhwak6KAGYBUQZXVtMsaJliYLNQIDAQAB
-AoGAXIqghPg6j48uGhbtlXHqHysu/Ran6T8sDYAuwNI2aoiv4kshxnOW/+teVFDd
-+SXb08XP/uCyVWIdEPCQI9obWppALzQhF5kALhchnlEATkVxkdx6T5PyGnFq5rpc
-NCfb3Q68T5bcFvsgup9Lt8JpGBQGvjYJZYkJuMvWmH6Bc9ECQQD4TwB+p5MjRALX
-lcMI8pURt6CKxpWLyFUUkQi6HksXzxeh4PDErLxsyFexKec7TOap5xnWZMPkjl76
-BdW65abrAkEA1R0XSCfu3B4LnX4zlDi+nUXG8YvquuZ21TRrNg3YmVcyF+jvkM1f
-4MGRPRF3hnTuZhnlD+wEubpmpcoNnNTOXwJBAIfZOQ0SAzblC6UE42puxU2nJ+ck
-1EZgeOPCoYKp9i11eJlw5mjDlGbziL59jWttHDlSHVmlUWMm3SFutcsFv7cCQQCK
-i+UM5dklhOrsMpV5sQJK4IgblGi/pQBwTym79HhyB/vrC2ZjbwD77xtq5iYcZXxv
-KDqAhWH1FLeS5K7A3KBlAkEAqwIhKyV1kK0EtvpNMprfIGNccRjNX8TJEQsN49EE
-luhKkAam4CoA1R2wZc0VHfWqilK0qhrezXxlo4OeElxiRg==
------END RSA PRIVATE KEY-----
diff --git a/tao/AnyTypeCode/Any_Basic_Impl.cpp b/tao/AnyTypeCode/Any_Basic_Impl.cpp
index 197a78cc06b..e90b3cd1162 100644
--- a/tao/AnyTypeCode/Any_Basic_Impl.cpp
+++ b/tao/AnyTypeCode/Any_Basic_Impl.cpp
@@ -283,7 +283,7 @@ namespace TAO
         break;
       case CORBA::tk_longdouble:
         {
-          CORBA::LongDouble tmp (ACE_CDR::LongDoubleAssign (0.0L));
+          CORBA::LongDouble tmp = ACE_CDR_LONG_DOUBLE_INITIALIZER;
           ACE_NEW_RETURN (retval,
                           TAO::Any_Basic_Impl (tc, &tmp),
                           0);
diff --git a/tao/AnyTypeCode/TypeCode_Case_T.h b/tao/AnyTypeCode/TypeCode_Case_T.h
index 548199bd4ad..a5e4b057816 100644
--- a/tao/AnyTypeCode/TypeCode_Case_T.h
+++ b/tao/AnyTypeCode/TypeCode_Case_T.h
@@ -114,8 +114,7 @@ namespace TAO
       virtual CORBA::Any * label (void) const;
       virtual bool marshal_label (TAO_OutputCDR & cdr) const;
       virtual bool equal_label (CORBA::ULong index,
-                                CORBA::TypeCode_ptr tc
-                                ) const;
+                                CORBA::TypeCode_ptr tc) const;
       //@}
 
     private:
diff --git a/tao/Basic_Argument_T.h b/tao/Basic_Argument_T.h
index e6a8d25cc61..9f20d9fd403 100644
--- a/tao/Basic_Argument_T.h
+++ b/tao/Basic_Argument_T.h
@@ -141,7 +141,6 @@ namespace TAO
     S x_;
   };
 
-
   /**
    * @struct Basic_Arg_Traits_T
    *
diff --git a/tao/Bounded_Basic_String_Sequence_T.h b/tao/Bounded_Basic_String_Sequence_T.h
index c1b1c57f398..4c09f1305f2 100644
--- a/tao/Bounded_Basic_String_Sequence_T.h
+++ b/tao/Bounded_Basic_String_Sequence_T.h
@@ -40,7 +40,7 @@ public:
   typedef details::generic_sequence<value_type, allocation_traits, element_traits> implementation_type;
 
   /// @copydoc TAO::details::generic_sequence::generic_sequence()
-  inline bounded_basic_string_sequence()
+  inline bounded_basic_string_sequence(void)
     : impl_()
   {}
   /// @copydoc TAO::details::generic_sequence::generic_sequence()
diff --git a/tao/CDR.h b/tao/CDR.h
index 60bb7e6eb45..d8a7f7fabe8 100644
--- a/tao/CDR.h
+++ b/tao/CDR.h
@@ -445,6 +445,25 @@ public:
   /// Called after demarshalling.
   void reset_vt_indirect_maps ();
 
+  /// Helper classes for extracting bounded strings into std::string/wstring.
+  struct TAO_Export to_std_string
+  {
+    to_std_string (std::string &s,
+                   ACE_CDR::ULong b);
+    std::string &val_;
+    ACE_CDR::ULong bound_;
+  };
+
+#if !defined(ACE_LACKS_STD_WSTRING)
+  struct TAO_Export to_std_wstring
+  {
+    to_std_wstring (std::wstring &ws,
+                    ACE_CDR::ULong b);
+    std::wstring &val_;
+    ACE_CDR::ULong bound_;
+  };
+#endif /* ACE_LACKS_STD_WSTRING */
+
 private:
   /// The ORB_Core, required to extract object references.
   TAO_ORB_Core* orb_core_;
@@ -493,6 +512,10 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
                                       ACE_OutputCDR::from_wstring x);
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
                                       const std::string &x);
+#if !defined(ACE_LACKS_STD_WSTRING)
+TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &os,
+                                      const std::wstring &x);
+#endif /* ACE_LACKS_STD_WSTRING */
 
 // CDR input operators for CORBA types
 
@@ -524,6 +547,14 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &os,
                                       ACE_InputCDR::to_wstring x);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &os,
                                       std::string &x);
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &os,
+                                      TAO_InputCDR::to_std_string x);
+#if !defined(ACE_LACKS_STD_WSTRING)
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &os,
+                                      std::wstring &x);
+TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &os,
+                                      TAO_InputCDR::to_std_wstring x);
+#endif /* ACE_LACKS_STD_WSTRING */
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/tao/CDR.inl b/tao/CDR.inl
index 13ec26dc110..1d22b697b14 100644
--- a/tao/CDR.inl
+++ b/tao/CDR.inl
@@ -329,6 +329,23 @@ TAO_InputCDR::reset_vt_indirect_maps ()
   }
 }
 
+ACE_INLINE
+TAO_InputCDR::to_std_string::to_std_string (std::string &s,
+                                            ACE_CDR::ULong b)
+  : val_ (s),
+    bound_ (b)
+{
+}
+
+#if !defined(ACE_LACKS_STD_WSTRING)
+ACE_INLINE
+TAO_InputCDR::to_std_wstring::to_std_wstring (std::wstring &s,
+                                              ACE_CDR::ULong b)
+  : val_ (s),
+    bound_ (b)
+{
+}
+#endif /* ACE_LACKS_STD_WSTRING */
 
 // ****************************************************************
 
@@ -461,6 +478,14 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
   return os << x.c_str ();
 }
 
+#if !defined(ACE_LACKS_STD_WSTRING)
+ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &os,
+                                      const std::wstring &x)
+{
+  return os << x.c_str ();
+}
+#endif /* ACE_LACKS_STD_WSTRING */
+
 // ****************************************************************
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
@@ -565,4 +590,40 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
   return marshal_flag;
 }
 
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
+                                      TAO_InputCDR::to_std_string x)
+{
+  CORBA::Boolean const marshal_flag =
+    is >> x.val_;
+  if (marshal_flag && x.bound_ != 0 && x.val_.size () > x.bound_)
+    {
+      throw ::CORBA::BAD_PARAM ();
+    }
+  return marshal_flag;
+}
+
+#if !defined(ACE_LACKS_STD_WSTRING)
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
+                                      std::wstring &x)
+{
+  CORBA::WChar *buf = 0;
+  CORBA::Boolean const marshal_flag = is >> buf;
+  x.assign (buf);
+  ACE::strdelete (buf);
+  return marshal_flag;
+}
+
+ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &is,
+                                      TAO_InputCDR::to_std_wstring x)
+{
+  CORBA::Boolean const marshal_flag =
+    is >> x.val_;
+  if (marshal_flag && x.bound_ != 0 && x.val_.size () > x.bound_)
+    {
+      throw ::CORBA::BAD_PARAM ();
+    }
+  return marshal_flag;
+}
+#endif /* ACE_LACKS_STD_WSTRING */
+
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/tao/Generic_Sequence_T.h b/tao/Generic_Sequence_T.h
index 7b24c0e297c..f977d4af29f 100644
--- a/tao/Generic_Sequence_T.h
+++ b/tao/Generic_Sequence_T.h
@@ -107,7 +107,7 @@ public:
   typedef range_checking<value_type,true> range;
 
   /// Default constructor.
-  generic_sequence()
+  generic_sequence(void)
     : maximum_(allocation_traits::default_maximum())
     , length_(0)
     , buffer_(allocation_traits::default_buffer_allocation())
diff --git a/tao/Incoming_Message_Stack.h b/tao/Incoming_Message_Stack.h
index 369f4c9da08..14a69d89183 100644
--- a/tao/Incoming_Message_Stack.h
+++ b/tao/Incoming_Message_Stack.h
@@ -21,10 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x630)
-#include /**/ "tao/TAO_Export.h"
-#endif
-
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Allocator;
 ACE_END_VERSIONED_NAMESPACE_DECL
@@ -41,11 +37,7 @@ namespace TAO
  * Internal class, providing stack functionality for TAO_Queued_Data
  * objects.  Stack operations don't require memory allocation.
 */
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x630)
-class TAO_Export Incoming_Message_Stack
-#else
 class Incoming_Message_Stack
-#endif
 {
 public:
   /// default constructor, initiliazes empty stack.
diff --git a/tao/Invocation_Adapter.h b/tao/Invocation_Adapter.h
index 844c446d424..958083c8945 100644
--- a/tao/Invocation_Adapter.h
+++ b/tao/Invocation_Adapter.h
@@ -149,7 +149,7 @@ namespace TAO
     /// Helper method that prepares the necessary stuff for a remote
     /// invocation.
 
-    /*
+    /**
      * This method does the following essential activities needed for
      * a remote invocation.
      *
@@ -237,7 +237,6 @@ namespace TAO
     Invocation_Adapter & operator= (const Invocation_Adapter &);
 
   protected:
-
     /// The target object on which this invocation is carried out.
     CORBA::Object_ptr target_;
 
diff --git a/tao/ORB_Core.cpp b/tao/ORB_Core.cpp
index 0d687e0cb5c..76f25a4ad37 100644
--- a/tao/ORB_Core.cpp
+++ b/tao/ORB_Core.cpp
@@ -2109,19 +2109,22 @@ TAO_ORB_Core::is_collocation_enabled (TAO_ORB_Core *orb_core,
   TAO_Profile* profile = 0;
   if (this->service_profile_selection(mp, profile) && profile)
   {
-    mp_temp.add_profile(profile);
+    if (mp_temp.add_profile(profile) == -1)
+      {
+        return false;
+      }
   }
 
   if (!orb_core->optimize_collocation_objects ())
-    return 0;
+    return false;
 
   if (!orb_core->use_global_collocation () && orb_core != this)
-    return 0;
+    return false;
 
   if (!orb_core->is_collocated (profile ? mp_temp : mp))
-    return 0;
+    return false;
 
-  return 1;
+  return true;
 }
 
 int
diff --git a/tao/Object.cpp b/tao/Object.cpp
index 40a7e5e1fe9..6acd25d3d5d 100644
--- a/tao/Object.cpp
+++ b/tao/Object.cpp
@@ -742,7 +742,14 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj)
           TAO_Profile *pfile = connector_registry->create_profile (cdr);
 
           if (pfile != 0)
-            mp.give_profile (pfile);
+            {
+              if (mp.give_profile (pfile) == -1)
+              {
+                ACE_ERROR ((LM_ERROR,
+                            ACE_TEXT ("TAO (%P|%t) ERROR: give_profile\n")
+                            ACE_TEXT (" returned -1\n")));
+              }
+            }
         }
 
       // Make sure we got some profiles!
@@ -863,7 +870,12 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x)
               TAO_Profile *pfile = connector_registry->create_profile (cdr);
               if (pfile != 0)
                 {
-                  mp.give_profile (pfile);
+                  if (mp.give_profile (pfile) == -1)
+                    {
+                      ACE_ERROR ((LM_ERROR,
+                                  ACE_TEXT ("TAO (%P|%t) ERROR: give_profile\n")
+                                  ACE_TEXT (" returned -1\n")));
+                    }
                 }
             }
 
diff --git a/tao/Object_KeyC.cpp b/tao/Object_KeyC.cpp
index dc6669b8e28..fbfd444ae81 100644
--- a/tao/Object_KeyC.cpp
+++ b/tao/Object_KeyC.cpp
@@ -2,7 +2,7 @@
 // $Id$
 
 /**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.2
+ * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.3
  * TAO and the TAO IDL Compiler have been developed by:
  *       Center for Distributed Object Computing
  *       Washington University
diff --git a/tao/Object_KeyC.h b/tao/Object_KeyC.h
index 1882658ec21..db2acf1f931 100644
--- a/tao/Object_KeyC.h
+++ b/tao/Object_KeyC.h
@@ -2,7 +2,7 @@
 // $Id$
 
 /**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.2
+ * Code generated by the The ACE ORB (TAO) IDL Compiler v2.0.3
  * TAO and the TAO IDL Compiler have been developed by:
  *       Center for Distributed Object Computing
  *       Washington University
@@ -28,8 +28,8 @@
 // TAO_IDL - Generated from
 // w:\tao\tao_idl\be\be_codegen.cpp:146
 
-#ifndef _TAO_PIDL_OBJECT_KEYC_GHONNS_H_
-#define _TAO_PIDL_OBJECT_KEYC_GHONNS_H_
+#ifndef _TAO_PIDL_OBJECT_KEYC_PZW4T3_H_
+#define _TAO_PIDL_OBJECT_KEYC_PZW4T3_H_
 
 #include /**/ "ace/pre.h"
 
diff --git a/tao/Version.h b/tao/Version.h
index 64acc60c5e9..3cc92af8360 100644
--- a/tao/Version.h
+++ b/tao/Version.h
@@ -5,5 +5,5 @@
 
 #define TAO_MAJOR_VERSION 2
 #define TAO_MINOR_VERSION 0
-#define TAO_BETA_VERSION 2
-#define TAO_VERSION "2.0.2"
+#define TAO_BETA_VERSION 3
+#define TAO_VERSION "2.0.3"
diff --git a/tests/IDL_Test/constants.idl b/tests/IDL_Test/constants.idl
index b93e5d3a385..5e462576201 100644
--- a/tests/IDL_Test/constants.idl
+++ b/tests/IDL_Test/constants.idl
@@ -74,7 +74,12 @@ const double trouble = 2.2250738585072014E-308;
 // platforms have 8-byte long doubles.
 
 const long double dbl_easy = 698.91148263188057;
+
+#if !defined (__MINGW32__)
+// Outputs a floating point error for this value.
 const long double dbl_dip = 1.797693134862315E+308;
+#endif /* defined (__MINGW32__) */
+
 const long double dbl_trouble = 2.2250738585072014E-308;
 const long double dbl_int = 7.;
 
diff --git a/tests/IDL_Test/union.idl b/tests/IDL_Test/union.idl
index 8464ae52ef7..75c157d3709 100644
--- a/tests/IDL_Test/union.idl
+++ b/tests/IDL_Test/union.idl
@@ -287,10 +287,3 @@ union decl_heavy_union switch (short)
     long m_anon_long_array[10];
 };
 
-// Tests CORBA::LongDouble implementation on platforms
-// without a native 16-byte long double.
-union ld_test switch (long)
-{
-  case 1: long double ld_mem;
-};
-
diff --git a/tests/LongDouble/client.cpp b/tests/LongDouble/client.cpp
index 02fdbebed49..614ab5de181 100644
--- a/tests/LongDouble/client.cpp
+++ b/tests/LongDouble/client.cpp
@@ -59,22 +59,24 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
                             1);
         }
 
-      CORBA::LongDouble ld =
+      CORBA::LongDouble ldl =
         longDoubleTest->get_long_double ();
+      long double ldh =
+        Global::get_long_double ();
 
-      if (ld == Global::get_long_double ())
-        {
-          cout << "Received: " << ld << endl;
-        }
-      else
+      if (ldl > ldh || ldl < ldh)
         {
           ACE_ERROR ((LM_DEBUG,
                       "Client did not receive "
                       "expected CORBA::LongDouble\n"));
-          cerr << "Received: " << ld << " instead of "
-               << Global::get_long_double () << endl;
+          cerr << "Received: " << ldl << " instead of "
+               << ldh << endl;
           status = 1;
         }
+      else
+        {
+          cout << "Received: " << ldl << endl;
+        }
 
       longDoubleTest->shutdown ();
 
diff --git a/tests/OBV/Simple/Client_i.h b/tests/OBV/Simple/Client_i.h
index 296bf588550..69f6d7794d4 100644
--- a/tests/OBV/Simple/Client_i.h
+++ b/tests/OBV/Simple/Client_i.h
@@ -38,7 +38,7 @@ public:
   Checkpoint_Client_i (void);
 
   /// Destructor
-  virtual  ~Checkpoint_Client_i (void);
+  virtual ~Checkpoint_Client_i (void);
 
   /// Execute the methods
   virtual int run (const char *,int, ACE_TCHAR** );
diff --git a/tests/OBV/Simple/OBV_impl.h b/tests/OBV/Simple/OBV_impl.h
index 7ef69a968b9..4164a6ff96b 100644
--- a/tests/OBV/Simple/OBV_impl.h
+++ b/tests/OBV/Simple/OBV_impl.h
@@ -5,7 +5,6 @@
 #define OBV_IMPL_H
 
 #include "OBVC.h"
-
 #include "tao/Valuetype/ValueFactory.h"
 
 class Event_impl : public virtual OBV_Event,
@@ -16,23 +15,18 @@ class Event_impl : public virtual OBV_Event,
   Event_impl (CORBA::Long value);
   virtual ~Event_impl ();
   virtual CORBA::ValueBase* _copy_value (void);
-
-
   virtual void do_print (void);
 };
 
 class Event_factory : public CORBA::ValueFactoryBase
 {
 public:
-
   // create (...) would go here
 
 protected:
-
   virtual ~Event_factory ();
 
 private:
-
   TAO_OBV_CREATE_RETURN_TYPE (Event) create_for_unmarshal (void);
 };
 
diff --git a/tests/OBV/Simple/Server_i.cpp b/tests/OBV/Simple/Server_i.cpp
index ad21429c1f8..498547af46c 100644
--- a/tests/OBV/Simple/Server_i.cpp
+++ b/tests/OBV/Simple/Server_i.cpp
@@ -46,8 +46,6 @@ Checkpoint_i::put_event (Event *event)
 {
   // Let us see what event has arrived
   event->do_print ();
-
-  return;
 }
 
 // Shutdown the server application.
@@ -62,15 +60,12 @@ Checkpoint_i::shutdown (void)
   this->orb_->shutdown ();
 }
 
-
 // Constructor.
-
 Checkpoint_i::Checkpoint_i (void)
 {
 }
 
 // Destructor.
-
 Checkpoint_i::~Checkpoint_i (void)
 {
 }
diff --git a/tests/OBV/Simple/Server_i.h b/tests/OBV/Simple/Server_i.h
index ae0b534a54b..c9ac63bb0ef 100644
--- a/tests/OBV/Simple/Server_i.h
+++ b/tests/OBV/Simple/Server_i.h
@@ -30,12 +30,9 @@ public:
   /// Destructor.
   ~Checkpoint_i (void);
 
-  virtual void put_event (
-        Event * e
-  );
+  virtual void put_event (Event * e);
 
-  virtual void shutdown (
-    );
+  virtual void shutdown (void);
 
   /// Set the ORB pointer.
   void orb (CORBA::ORB_ptr o);
diff --git a/tests/OBV/Simple/server.cpp b/tests/OBV/Simple/server.cpp
index 8cb92053d94..d2e2dec29d7 100644
--- a/tests/OBV/Simple/server.cpp
+++ b/tests/OBV/Simple/server.cpp
@@ -12,12 +12,9 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n\tCheckpoint Event_Types server\n\n"));
 
-
   try
     {
-      if (server.init ("Event_Types_Checkpoint",
-                       argc,
-                       argv) == -1)
+      if (server.init ("Event_Types_Checkpoint", argc, argv) == -1)
         return 1;
       else
         {
diff --git a/tests/Smart_Proxies/README b/tests/Smart_Proxies/README
index 1cab0594585..2efc69dbe7f 100644
--- a/tests/Smart_Proxies/README
+++ b/tests/Smart_Proxies/README
@@ -14,11 +14,11 @@ www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/docs/Smart_Proxies.html
 Smart Proxy Example
 -------------------
 
-This directory contains a simple example that demostrats how the TAO
+This directory contains a simple example that demonstrates how the TAO
 Smart Proxy feature can be used.  In this example, just a single
 method has been "smartified" to illustrate how you just implement the
 methods you wish to customize since the rest will be taken care of the
-genearated Smart Proxy base class.
+generated Smart Proxy base class.
 
 All you need to define in the client application is a new factory that
 will produce the kind of proxy desired by the user.  This factory must