Merged version 94552 from main trunk into this branchalt_mapping_SAIC

14 files changed, 329 insertions, 303 deletions

diff --git a/orbsvcs/orbsvcs/AV/AVStreams_i.h b/orbsvcs/orbsvcs/AV/AVStreams_i.h
index 35d77b38b22..fb77a839fab 100644
--- a/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ b/orbsvcs/orbsvcs/AV/AVStreams_i.h
@@ -313,8 +313,7 @@ public:
                            const char * format_name);
 
   virtual void set_dev_params (const char * flowName,
-                               const CosPropertyService::Properties & new_params)
-;
+                               const CosPropertyService::Properties & new_params);
 
 protected:
   /// checks whether the flowname is  in the flow_spec.
diff --git a/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp b/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp
index 9b6996230c1..41360c443d4 100644
--- a/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp
+++ b/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp
@@ -58,7 +58,7 @@ TAO::PG_Properties_Support::set_type_properties (
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->internals_);
 
-  TAO::PG_Property_Set * typeid_properties;
+  TAO::PG_Property_Set * typeid_properties = 0;
   if ( 0 != this->properties_map_.find (type_id, typeid_properties))
   {
     ACE_NEW_THROW_EX (
diff --git a/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
index 993f6eb0225..3a2156b6445 100644
--- a/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
+++ b/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
@@ -431,9 +431,7 @@ TAO_PropertySet::define_property (const char *property_name,
   CosProperty_Hash_Key hash_key (property_name);
   CosProperty_Hash_Value hash_value (property_value,
                                      CosPropertyService::normal);
-  COSPROPERTY_HASH_ENTRY *entry_ptr;
-  //CosProperty_Hash_Key old_key;
-  //CosProperty_Hash_Value old_value;
+  COSPROPERTY_HASH_ENTRY *entry_ptr = 0;
 
   int ret = this->hash_table_.bind (hash_key,
                                     hash_value,
diff --git a/orbsvcs/tests/Bug_2112_Regression/client.cpp b/orbsvcs/tests/Bug_2112_Regression/client.cpp
index 64b1aa5d13f..76822cee502 100644
--- a/orbsvcs/tests/Bug_2112_Regression/client.cpp
+++ b/orbsvcs/tests/Bug_2112_Regression/client.cpp
@@ -9,54 +9,62 @@
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int retval = 0;
-  // Initialise ORB
-  CORBA::ORB_var Orb = CORBA::ORB_init(argc, argv);
+  try
+    {
+      // Initialise ORB
+      CORBA::ORB_var Orb = CORBA::ORB_init(argc, argv);
 
-  // Set round-trip timeout
-  const int timeout_secs = 5;
+      // Set round-trip timeout
+      const int timeout_secs = 5;
 
-  CORBA::Object_var obj = Orb->resolve_initial_references ("ORBPolicyManager");
-  CORBA::PolicyManager_var policy_manager =
-    CORBA::PolicyManager::_narrow (obj.in());
+      CORBA::Object_var obj = Orb->resolve_initial_references ("ORBPolicyManager");
+      CORBA::PolicyManager_var policy_manager =
+        CORBA::PolicyManager::_narrow (obj.in());
 
-  CORBA::PolicyList policy_list;
-  policy_list.length(0);
-  policy_manager->set_policy_overrides(policy_list, CORBA::SET_OVERRIDE);
+      CORBA::PolicyList policy_list;
+      policy_list.length(0);
+      policy_manager->set_policy_overrides(policy_list, CORBA::SET_OVERRIDE);
 
-  TimeBase::TimeT timeout = timeout_secs * 10000000;
-  CORBA::Any orb_timeout;
-  orb_timeout <<= timeout;
-  policy_list.length(1);
-  policy_list[0] = Orb->create_policy(
-    Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, orb_timeout);
+      TimeBase::TimeT timeout = timeout_secs * 10000000;
+      CORBA::Any orb_timeout;
+      orb_timeout <<= timeout;
+      policy_list.length(1);
+      policy_list[0] = Orb->create_policy(
+        Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE, orb_timeout);
 
-  policy_manager->set_policy_overrides(policy_list, CORBA::SET_OVERRIDE);
+      policy_manager->set_policy_overrides(policy_list, CORBA::SET_OVERRIDE);
 
-  // Now try to contact a server.
-  // Use a remote machine that is unreachable on the network.
-  const char * obj_ref = "corbaloc:iiop:1.0@123.123.123.123:4567/NameService";
+      // Now try to contact a server.
+      // Use a remote machine that is unreachable on the network.
+      const char * obj_ref = "corbaloc:iiop:1.0@123.123.123.123:4567/NameService";
 
-  obj = Orb->string_to_object(obj_ref);
+      obj = Orb->string_to_object(obj_ref);
 
-  CosNaming::NamingContext_var inc;
-  if(!CORBA::is_nil(obj.in ()))
-    {
-      ACE_DEBUG(( LM_INFO, "Attempting to contact %C\n", obj_ref ));
-      try
-        {
-          inc = CosNaming::NamingContext::_narrow(obj.in());
-          ACE_DEBUG(( LM_INFO, "OK\n" ));
-        }
-      catch(const CORBA::TRANSIENT &)
+      CosNaming::NamingContext_var inc;
+      if(!CORBA::is_nil(obj.in ()))
         {
-          ACE_ERROR ((LM_ERROR, "Error, caught transient exception\n"));
-          retval = 1;
-        }
-      catch(const CORBA::TIMEOUT &)
-        {
-          ACE_DEBUG ((LM_DEBUG, "Caught correct timeout\n"));
+          ACE_DEBUG(( LM_INFO, "Attempting to contact %C\n", obj_ref ));
+          try
+            {
+              inc = CosNaming::NamingContext::_narrow(obj.in());
+              ACE_DEBUG(( LM_INFO, "OK\n" ));
+            }
+          catch(const CORBA::TRANSIENT &)
+            {
+              ACE_ERROR ((LM_ERROR, "Error, caught transient exception\n"));
+              retval = 1;
+            }
+          catch(const CORBA::TIMEOUT &)
+            {
+              ACE_DEBUG ((LM_DEBUG, "Caught correct timeout\n"));
+            }
         }
     }
+  catch (const ::CORBA::Exception &ex)
+    {
+      ex._tao_print_exception("ERROR : unexpected CORBA exception caugth :");
+      ++retval;
+    }
 
   return retval;
 }
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp b/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp
index 6b8f15dbcec..1626804a4bf 100644
--- a/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp
+++ b/orbsvcs/tests/InterfaceRepo/Bug_2962_Regression/client.cpp
@@ -36,74 +36,84 @@ parse_args (int argc, ACE_TCHAR *argv[])
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-    CORBA::ORB_var the_orb = CORBA::ORB_init (argc, argv);
+  try
+    {
+      CORBA::ORB_var the_orb = CORBA::ORB_init (argc, argv);
 
-    if (parse_args (argc, argv) != 0)
-            return 1;
+      if (parse_args (argc, argv) != 0)
+        return 1;
 
-    CORBA::Object_var obj = the_orb->string_to_object (ACE_TEXT_ALWAYS_CHAR(ifr_ior));
-    if (CORBA::is_nil (obj.in()))
-    {
-      ACE_DEBUG ((LM_DEBUG, "Obtained nil reference to Object for interface repository\n" ));
-      return 1;
-    }
-    CORBA::ComponentIR::Repository_var ifr;
-    try
-    {
-      ifr = CORBA::ComponentIR::Repository::_narrow (obj.in());
-    }
-    catch (CORBA::SystemException &)
-    {
-      ACE_DEBUG ((LM_DEBUG, "exception catched .. narrowing IFR object\n" ));
-      return 1;
-    }
-    if (CORBA::is_nil (ifr.in()))
-    {
-      ACE_DEBUG ((LM_DEBUG, "Can't narrow to IFR\n" ));
-      return 1;
-    }
+      CORBA::Object_var obj = the_orb->string_to_object (ACE_TEXT_ALWAYS_CHAR(ifr_ior));
+      if (CORBA::is_nil (obj.in()))
+        {
+          ACE_DEBUG ((LM_DEBUG, "Obtained nil reference to Object for interface repository\n" ));
+          return 1;
+        }
 
-    ACE_DEBUG ((LM_DEBUG, "Looking up %C", member_type_id ));
-    CORBA::Contained_var
-      dependency = ifr->lookup_id (ACE_TEXT_ALWAYS_CHAR(member_type_id));
-    if (CORBA::is_nil (dependency.in ()))
-    {
-      ACE_DEBUG ((LM_DEBUG, " *** failed ***\n" ));
-      return 1;
-    }
+      CORBA::ComponentIR::Repository_var ifr;
 
-    CORBA::AliasDef_var
-        the_alias = CORBA::AliasDef::_narrow (dependency.in ());
-    if (CORBA::is_nil (the_alias.in ()))
-    {
-      ACE_DEBUG ((LM_DEBUG, " *** not an alias ***\n" ));
-      return 1;
-    }
+      try
+        {
+          ifr = CORBA::ComponentIR::Repository::_narrow (obj.in());
+        }
+      catch (CORBA::SystemException &)
+        {
+          ACE_DEBUG ((LM_DEBUG, "exception catched .. narrowing IFR object\n" ));
+          return 1;
+        }
 
-    CORBA::IDLType_var
-      orig_type = the_alias->original_type_def ();
-    CORBA::TypeCode_var
-      tc_content = orig_type->type ();
-    const CORBA::ULong
-      length= tc_content->length ();
-    CORBA::TypeCode_var
-      cont_type = tc_content->content_type ();
-    const char
-      *name= cont_type->name ();
-    ACE_DEBUG ((LM_DEBUG,
-                " = %C [%u]\n",
-                name,
-                length ));
+      if (CORBA::is_nil (ifr.in()))
+        {
+          ACE_DEBUG ((LM_DEBUG, "Can't narrow to IFR\n" ));
+          return 1;
+        }
 
-    if (2u == length)
-    {
-      ACE_DEBUG ((LM_DEBUG, "Correct result, test passed\n" ));
+      ACE_DEBUG ((LM_DEBUG, "Looking up %C", member_type_id ));
+      CORBA::Contained_var
+        dependency = ifr->lookup_id (ACE_TEXT_ALWAYS_CHAR(member_type_id));
+      if (CORBA::is_nil (dependency.in ()))
+        {
+          ACE_DEBUG ((LM_DEBUG, " *** failed ***\n" ));
+          return 1;
+        }
+
+      CORBA::AliasDef_var
+          the_alias = CORBA::AliasDef::_narrow (dependency.in ());
+      if (CORBA::is_nil (the_alias.in ()))
+        {
+          ACE_DEBUG ((LM_DEBUG, " *** not an alias ***\n" ));
+          return 1;
+        }
+
+      CORBA::IDLType_var
+        orig_type = the_alias->original_type_def ();
+      CORBA::TypeCode_var
+        tc_content = orig_type->type ();
+      const CORBA::ULong
+        length= tc_content->length ();
+      CORBA::TypeCode_var
+        cont_type = tc_content->content_type ();
+      const char
+        *name= cont_type->name ();
+      ACE_DEBUG ((LM_DEBUG,
+                  " = %C [%u]\n",
+                  name,
+                  length ));
+
+      if (2u == length)
+        {
+          ACE_DEBUG ((LM_DEBUG, "Correct result, test passed\n" ));
+        }
+      else
+        {
+          ACE_DEBUG ((LM_DEBUG, "Error: Should have been %C [2]\n", name));
+          return 2;
+        }
     }
-    else
+  catch (const ::CORBA::Exception &ex)
     {
-      ACE_DEBUG ((LM_DEBUG, "Error: Should have been %C [2]\n", name));
-      return 2;
+      ex._tao_print_exception("ERROR : unexpected CORBA exception caugth :");
+      return 1;
     }
-
-    return 0;
+  return 0;
 }
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp b/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp
index ed87bdd9215..a69e2f32b25 100644
--- a/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp
+++ b/orbsvcs/tests/InterfaceRepo/Bug_3155_Regression/test_idl.cpp
@@ -57,70 +57,77 @@ parse_args (int argc, ACE_TCHAR *argv[])
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  // init orb
-  CORBA::ORB_var the_orb =
-    CORBA::ORB_init (argc, argv);
-
-  if (parse_args (argc, argv) == -1)
+  try
     {
-      return -1;
-    }
+      // init orb
+      CORBA::ORB_var the_orb =
+        CORBA::ORB_init (argc, argv);
 
-  // get IFR
-  CORBA::Object_var objref =
-    the_orb->string_to_object (ifr_ior_file);
-  if (objref.in () == 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                          "The received objref is nil\n"),
-                        -1);
-    }
+      if (parse_args (argc, argv) == -1)
+        {
+          return -1;
+        }
 
-  CORBA::ComponentIR::Repository_var the_repo_ref;
-  try
-    {
-      the_repo_ref = CORBA::ComponentIR::Repository::_narrow (objref.in ());
-    }
-  catch (CORBA::Exception &ex)
-    {
-      ex._tao_print_exception ("Can't narrow the IFR:");
-      return 1;
-    }
+      // get IFR
+      CORBA::Object_var objref =
+        the_orb->string_to_object (ifr_ior_file);
+      if (objref.in () == 0)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                              "The received objref is nil\n"),
+                            -1);
+        }
 
-  // search in repository
-  CORBA::Contained_var current_contained =
-    the_repo_ref->lookup_id (ACE_TEXT_ALWAYS_CHAR (idl_value));
-  if (CORBA::is_nil(current_contained.in ()))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                          "Can't look up the valuetype\n"),
-                        -1);
-    }
+      CORBA::ComponentIR::Repository_var the_repo_ref;
+      try
+        {
+          the_repo_ref = CORBA::ComponentIR::Repository::_narrow (objref.in ());
+        }
+      catch (CORBA::Exception &ex)
+        {
+          ex._tao_print_exception ("Can't narrow the IFR:");
+          return 1;
+        }
 
-  // get value type definition
-  CORBA::ExtValueDef_var value_def =
-    CORBA::ExtValueDef::_narrow (current_contained.in ());
-  CORBA::ExtValueDef::ExtFullValueDescription_var value_descr;
-  try
-    {
-      value_descr = value_def->describe_ext_value ();
+      // search in repository
+      CORBA::Contained_var current_contained =
+        the_repo_ref->lookup_id (ACE_TEXT_ALWAYS_CHAR (idl_value));
+      if (CORBA::is_nil(current_contained.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                              "Can't look up the valuetype\n"),
+                            -1);
+        }
+
+      // get value type definition
+      CORBA::ExtValueDef_var value_def =
+        CORBA::ExtValueDef::_narrow (current_contained.in ());
+      CORBA::ExtValueDef::ExtFullValueDescription_var value_descr;
+      try
+        {
+          value_descr = value_def->describe_ext_value ();
+        }
+      catch (CORBA::Exception &ex)
+        {
+          ex._tao_print_exception ("Can't describe_ext_value:");
+          return 1;
+        }
+
+      CORBA::ValueMemberSeq& the_value_members =
+        value_descr->members;
+      for (CORBA::ULong ct = 0; ct < the_value_members.length (); ++ct)
+      {
+        const CORBA::ValueMember& current_member =
+          the_value_members [ct];
+        ACE_DEBUG ((LM_DEBUG,
+                    "value type member '%C'\n",
+                    current_member.name.in ()));
+      }
     }
   catch (CORBA::Exception &ex)
     {
-      ex._tao_print_exception ("Can't describe_ext_value:");
+      ex._tao_print_exception ("MAIN: Unexpected CORBA exception caught:");
       return 1;
     }
-
-  CORBA::ValueMemberSeq& the_value_members =
-    value_descr->members;
-  for (CORBA::ULong ct = 0; ct < the_value_members.length (); ++ct)
-  {
-    const CORBA::ValueMember& current_member =
-      the_value_members [ct];
-    ACE_DEBUG ((LM_DEBUG,
-                "value type member '%C'\n",
-                current_member.name.in ()));
-  }
-
   return 0;
 }
diff --git a/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp b/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp
index d6af0b90df0..4b8d8b650a3 100644
--- a/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp
+++ b/orbsvcs/tests/InterfaceRepo/Bug_3174_Regression/test_idl.cpp
@@ -55,17 +55,16 @@ int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int result= 0;
   ACE_DEBUG (( LM_DEBUG, "Start\n" ));
-  // init orb
-  CORBA::ORB_var the_orb =
-    CORBA::ORB_init (argc, argv);
-
-  if (parse_args (argc, argv) == -1)
-    {
-      return -1;
-    }
 
   try
     {
+      // init orb
+      CORBA::ORB_var the_orb =
+        CORBA::ORB_init (argc, argv);
+
+      if (parse_args (argc, argv) == -1)
+          return -1;
+
       ACE_DEBUG (( LM_DEBUG, "Get IFR\n" ));
       CORBA::Object_var objref =
         the_orb->string_to_object (ifr_ior_file);
diff --git a/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/client.cpp b/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/client.cpp
index b88aec910d0..f57bec82ddf 100644
--- a/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/client.cpp
+++ b/orbsvcs/tests/InterfaceRepo/Union_Forward_Test/client.cpp
@@ -9,54 +9,61 @@ int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   //init IFR objref
+  try
+    {
+      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
 
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
+      TAO_IFR_Client_Adapter *ifr_client =
+        ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+          TAO_ORB_Core::ifr_client_adapter_name ());
 
-  TAO_IFR_Client_Adapter *ifr_client =
-    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
-      TAO_ORB_Core::ifr_client_adapter_name ());
+      if (ifr_client == 0)
+        {
+          throw ::CORBA::INTF_REPOS ();
+        }
 
-  if (ifr_client == 0)
-    {
-      throw ::CORBA::INTF_REPOS ();
-    }
+      ACE_DEBUG ((LM_DEBUG, "Got IFR_Client ref.\n"));
 
-  ACE_DEBUG ((LM_DEBUG, "Got IFR_Client ref.\n"));
+      CORBA::InterfaceDef_var intDef =
+        ifr_client->get_interface (orb.in (), "IDL:IFR_Test/test_if:1.0");
 
-  CORBA::InterfaceDef_var intDef =
-    ifr_client->get_interface (orb.in (), "IDL:IFR_Test/test_if:1.0");
+      if (CORBA::is_nil (intDef.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                            "get interface returned nil ref\n"),
+                            1);
+        }
 
-  if (CORBA::is_nil (intDef.in ()))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "get interface returned nil ref\n"),
-                        1);
-    }
+      CORBA::ContainedSeq_var attributes =
+        intDef->contents (CORBA::dk_Attribute, 1);
+      CORBA::ULong n_ats = attributes->length ();
 
-  CORBA::ContainedSeq_var attributes =
-    intDef->contents (CORBA::dk_Attribute, 1);
-  CORBA::ULong n_ats = attributes->length ();
+      CORBA::ULong index = 0UL;
+      CORBA::String_var name = attributes[index]->name ();
+      ACE_DEBUG ((LM_DEBUG,
+                  "found %d attributes, name = %s\n",
+                  n_ats,
+                  name.in ()));
 
-  CORBA::ULong index = 0UL;
-  CORBA::String_var name = attributes[index]->name ();
-  ACE_DEBUG ((LM_DEBUG,
-              "found %d attributes, name = %s\n",
-              n_ats,
-              name.in ()));
+      CORBA::AttributeDef_var attr =
+        CORBA::AttributeDef::_narrow (attributes[index]);
 
-  CORBA::AttributeDef_var attr =
-    CORBA::AttributeDef::_narrow (attributes[index]);
+      if (CORBA::is_nil (attr.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                            "could not narrow attribute ref\n"),
+                            1);
+        }
 
-  if (CORBA::is_nil (attr.in ()))
+      CORBA::TypeCode_var tc = attr->type ();
+
+      ACE_DEBUG ((LM_DEBUG, "foo attr typecode = %s\n", tc->id ()));
+    }
+  catch (const ::CORBA::Exception &ex)
     {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "could not narrow attribute ref\n"),
-                        1);
+      ex._tao_print_exception("ERROR : unexpected CORBA exception caugth :");
+      return 1;
     }
 
-  CORBA::TypeCode_var tc = attr->type ();
-
-  ACE_DEBUG ((LM_DEBUG, "foo attr typecode = %s\n", tc->id ()));
-
   return 0;
 }
diff --git a/orbsvcs/tests/Notify/lib/Peer_T.cpp b/orbsvcs/tests/Notify/lib/Peer_T.cpp
index 62a30ea9a2a..c93dd2a6af9 100644
--- a/orbsvcs/tests/Notify/lib/Peer_T.cpp
+++ b/orbsvcs/tests/Notify/lib/Peer_T.cpp
@@ -155,8 +155,6 @@ TAO_Notify_Tests_Peer_T<Peer_Traits>::status (void)
                   "Peer %s is_equivanent other exception.",
                   this->name_.c_str ()));
     }
-#else
-;
 #endif /* TAO_HAS_MINIMUM_CORBA */
 }
 
diff --git a/orbsvcs/tests/Security/BiDirectional/ssl/ca.pem b/orbsvcs/tests/Security/BiDirectional/ssl/ca.pem
index 05c2387f5c8..f580b756820 100644
--- a/orbsvcs/tests/Security/BiDirectional/ssl/ca.pem
+++ b/orbsvcs/tests/Security/BiDirectional/ssl/ca.pem
@@ -1,34 +1,34 @@
 -----BEGIN CERTIFICATE-----
-MIICyDCCAjGgAwIBAgIJAOtnDNOy1r76MA0GCSqGSIb3DQEBBAUAME0xCzAJBgNV
+MIICyDCCAjGgAwIBAgIJAJLBvLx9WUXKMA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV
 BAYTAlVTMQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3QuIExvdWlzMQwwCgYDVQQK
-EwNPQ0kxDzANBgNVBAMTBnNlcnZlcjAeFw0wOTA5MDIwOTE0MjdaFw0xMDA5MDIw
-OTE0MjdaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3Qu
+EwNPQ0kxDzANBgNVBAMTBnNlcnZlcjAeFw0xMTA4MjIxNTMyMjNaFw0xMjA4MjEx
+NTMyMjNaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3Qu
 IExvdWlzMQwwCgYDVQQKEwNPQ0kxDzANBgNVBAMTBnNlcnZlcjCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEAtgLRQTR0cglW88zdM0KU/Umx1ma6U3i9OxSZWJng
-mDtfZGxKDDzROAUg2pnxzaXbbPxatFKBPb/NhzPXHZUK6qfBmwmiH+APoHMuKBmn
-izL2Jt2V8LNzCmJcHPDJJuG7usdBH36CUuC33Z6BPxwLLYkTGT5lUkICWlduZRid
-BssCAwEAAaOBrzCBrDAdBgNVHQ4EFgQU+KYirnLzyICLQxyEybtrOvJ8ekEwfQYD
-VR0jBHYwdIAU+KYirnLzyICLQxyEybtrOvJ8ekGhUaRPME0xCzAJBgNVBAYTAlVT
+9w0BAQEFAAOBjQAwgYkCgYEAzqVyUomhG3Zjvn6up7p2QCtjVOWMzeVr1aWYu2Ce
+W+ts/bwhmLVnp2qiANYQbQF47sHkxtL3KYa3aQy2JFwmJqPa4k478mg/316Fy9Yc
+MxL7l9rDC3GLdSyq4M6xqtYz12RepUydFwGfphvpL7augq/iKOjYsotezpUH87Ok
+vtkCAwEAAaOBrzCBrDAdBgNVHQ4EFgQUE+ZKmmcNsspWePyp/z0dRJor4IowfQYD
+VR0jBHYwdIAUE+ZKmmcNsspWePyp/z0dRJor4IqhUaRPME0xCzAJBgNVBAYTAlVT
 MQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3QuIExvdWlzMQwwCgYDVQQKEwNPQ0kx
-DzANBgNVBAMTBnNlcnZlcoIJAOtnDNOy1r76MAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQEEBQADgYEAac1LPqFHgE04iIltUtwvDd5KaSkbkwRCJ3xA8BACIimFYyoY
-2uahz4c/9F/3rw2oAil5b7RN+9RnGSVZYwYRd6z1sul5URiWQ7sQ3ZfVrS7pOhbE
-nephLwFScEOdW7GaQcCkexqgvQaXACgQMEGDKkzgbTmXmVbwQbzbWqWbSx8=
+DzANBgNVBAMTBnNlcnZlcoIJAJLBvLx9WUXKMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQEFBQADgYEALoJCh6ZO52X3BfO/WbuBmvLbjwoX5LQdR+P/Ckz5ZKNdVTSI
+SkDDS+DUB77DMstAq65kcfq+gFwedb2k82Uk1TkenQ0BX3dBkAO2w5M2ipqHN2ez
+3kQ//pzWh/+k8QNgbQSwxKA2UwkbXBhDc2KbT+klhqCGA2hl0KySImgX5Jk=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIICyDCCAjGgAwIBAgIJAIWuLPvf+I38MA0GCSqGSIb3DQEBBAUAME0xCzAJBgNV
+MIICyDCCAjGgAwIBAgIJAJfoN7qD0W7YMA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV
 BAYTAlVTMQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3QuIExvdWlzMQwwCgYDVQQK
-EwNPQ0kxDzANBgNVBAMTBmNsaWVudDAeFw0wOTA5MDIwOTE0MjdaFw0xMDA5MDIw
-OTE0MjdaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3Qu
+EwNPQ0kxDzANBgNVBAMTBmNsaWVudDAeFw0xMTA4MjIxNTMyMjRaFw0xMjA4MjEx
+NTMyMjRaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3Qu
 IExvdWlzMQwwCgYDVQQKEwNPQ0kxDzANBgNVBAMTBmNsaWVudDCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEA6quNMlXAgLnnMZtjMzfj+q7tP9vLWy6CkbVJq9TM
-xGVMfNZ6UIQqA9rZsiYnz+hHX5tnt6RIlHzhMTPTA4FPyHFlPdJjkTPvfyp0F+sf
-H5cBNUemDWYB6cz3uzxMet146qYKKea8QgIyKhCy0/TUZU/sb8VFgZP/zMxpo6OZ
-BOkCAwEAAaOBrzCBrDAdBgNVHQ4EFgQUr9z2Ep75QKJkVUgBC8NpnKOmX0UwfQYD
-VR0jBHYwdIAUr9z2Ep75QKJkVUgBC8NpnKOmX0WhUaRPME0xCzAJBgNVBAYTAlVT
+9w0BAQEFAAOBjQAwgYkCgYEA2qjlVQ1oFxHyEc6FueJf1ZgpU5TFCzW47eNTDWSg
+mZELK72neyZ9rtBHqUGmOYU4pNMDz9vqc3gZ29c0wesNgKRM9Xsc/9CXLZK3eSYY
+qiqxjrwG/2EnAXprskgK2Mrt26HdfKUBq7wdQwmLrleNtUoeKHyQyfe+eL/BTMSP
+GMMCAwEAAaOBrzCBrDAdBgNVHQ4EFgQUnO1q8yoFZPjmMm0Wu3TJT0gOFuIwfQYD
+VR0jBHYwdIAUnO1q8yoFZPjmMm0Wu3TJT0gOFuKhUaRPME0xCzAJBgNVBAYTAlVT
 MQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3QuIExvdWlzMQwwCgYDVQQKEwNPQ0kx
-DzANBgNVBAMTBmNsaWVudIIJAIWuLPvf+I38MAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQEEBQADgYEAGD6R4borxgxTJHHgKe5+xfYMVTLVVqS2Ku3inlzSIFaPXrbl
-Y/WEN3rUUWUf7RU0vhbiVS14hBCTgd9Y6STBC8dkbSBb979VPWefUgQc21/O6bO6
-zCNm0f4EHvYyxDANtlVOIiYn7KaM4SQUT1u3kVH2M5uD3NABLgdutE1297I=
+DzANBgNVBAMTBmNsaWVudIIJAJfoN7qD0W7YMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQEFBQADgYEArzMbOXyqBde8fjozyOOWEQcP+MppUbOVAXfdntbDwVYEld7S
+PofHVJ9jMNFN3HR5B7/5+NcwQRX6qivudMA5CXGyBTkH8Eeuth9E76tb6QJv8nTX
+bnIkk87foDoTxjHNkeBsNV89k2lMF721084yaISR4JJAJ5tRU0xXOzNkkpw=
 -----END CERTIFICATE-----
diff --git a/orbsvcs/tests/Security/BiDirectional/ssl/client-cert.pem b/orbsvcs/tests/Security/BiDirectional/ssl/client-cert.pem
index 124e8f3a380..cc35017c829 100644
--- a/orbsvcs/tests/Security/BiDirectional/ssl/client-cert.pem
+++ b/orbsvcs/tests/Security/BiDirectional/ssl/client-cert.pem
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICyDCCAjGgAwIBAgIJAIWuLPvf+I38MA0GCSqGSIb3DQEBBAUAME0xCzAJBgNV
+MIICyDCCAjGgAwIBAgIJAJfoN7qD0W7YMA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV
 BAYTAlVTMQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3QuIExvdWlzMQwwCgYDVQQK
-EwNPQ0kxDzANBgNVBAMTBmNsaWVudDAeFw0wOTA5MDIwOTE0MjdaFw0xMDA5MDIw
-OTE0MjdaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3Qu
+EwNPQ0kxDzANBgNVBAMTBmNsaWVudDAeFw0xMTA4MjIxNTMyMjRaFw0xMjA4MjEx
+NTMyMjRaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3Qu
 IExvdWlzMQwwCgYDVQQKEwNPQ0kxDzANBgNVBAMTBmNsaWVudDCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEA6quNMlXAgLnnMZtjMzfj+q7tP9vLWy6CkbVJq9TM
-xGVMfNZ6UIQqA9rZsiYnz+hHX5tnt6RIlHzhMTPTA4FPyHFlPdJjkTPvfyp0F+sf
-H5cBNUemDWYB6cz3uzxMet146qYKKea8QgIyKhCy0/TUZU/sb8VFgZP/zMxpo6OZ
-BOkCAwEAAaOBrzCBrDAdBgNVHQ4EFgQUr9z2Ep75QKJkVUgBC8NpnKOmX0UwfQYD
-VR0jBHYwdIAUr9z2Ep75QKJkVUgBC8NpnKOmX0WhUaRPME0xCzAJBgNVBAYTAlVT
+9w0BAQEFAAOBjQAwgYkCgYEA2qjlVQ1oFxHyEc6FueJf1ZgpU5TFCzW47eNTDWSg
+mZELK72neyZ9rtBHqUGmOYU4pNMDz9vqc3gZ29c0wesNgKRM9Xsc/9CXLZK3eSYY
+qiqxjrwG/2EnAXprskgK2Mrt26HdfKUBq7wdQwmLrleNtUoeKHyQyfe+eL/BTMSP
+GMMCAwEAAaOBrzCBrDAdBgNVHQ4EFgQUnO1q8yoFZPjmMm0Wu3TJT0gOFuIwfQYD
+VR0jBHYwdIAUnO1q8yoFZPjmMm0Wu3TJT0gOFuKhUaRPME0xCzAJBgNVBAYTAlVT
 MQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3QuIExvdWlzMQwwCgYDVQQKEwNPQ0kx
-DzANBgNVBAMTBmNsaWVudIIJAIWuLPvf+I38MAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQEEBQADgYEAGD6R4borxgxTJHHgKe5+xfYMVTLVVqS2Ku3inlzSIFaPXrbl
-Y/WEN3rUUWUf7RU0vhbiVS14hBCTgd9Y6STBC8dkbSBb979VPWefUgQc21/O6bO6
-zCNm0f4EHvYyxDANtlVOIiYn7KaM4SQUT1u3kVH2M5uD3NABLgdutE1297I=
+DzANBgNVBAMTBmNsaWVudIIJAJfoN7qD0W7YMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQEFBQADgYEArzMbOXyqBde8fjozyOOWEQcP+MppUbOVAXfdntbDwVYEld7S
+PofHVJ9jMNFN3HR5B7/5+NcwQRX6qivudMA5CXGyBTkH8Eeuth9E76tb6QJv8nTX
+bnIkk87foDoTxjHNkeBsNV89k2lMF721084yaISR4JJAJ5tRU0xXOzNkkpw=
 -----END CERTIFICATE-----
diff --git a/orbsvcs/tests/Security/BiDirectional/ssl/client-key.pem b/orbsvcs/tests/Security/BiDirectional/ssl/client-key.pem
index 9155f04ba83..adfbf067d3d 100644
--- a/orbsvcs/tests/Security/BiDirectional/ssl/client-key.pem
+++ b/orbsvcs/tests/Security/BiDirectional/ssl/client-key.pem
@@ -1,32 +1,32 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQDqq40yVcCAuecxm2MzN+P6ru0/28tbLoKRtUmr1MzEZUx81npQ
-hCoD2tmyJifP6Edfm2e3pEiUfOExM9MDgU/IcWU90mORM+9/KnQX6x8flwE1R6YN
-ZgHpzPe7PEx63Xjqpgop5rxCAjIqELLT9NRlT+xvxUWBk//MzGmjo5kE6QIDAQAB
-AoGAaVARrowjNuG26mFElIC5lA+aszTNPx9RQ1irNizqtByNxdxuyeF2BYLafYN4
-DGq+VR6l3hkg5VphqTYLtZ/7kCmVExF+csCKWMcGfz53Cm3XXZ/t5JERxgTy7tu4
-xP+2kavP0xPOvO/IdnU2/fcduwcV5RmZtmvNCr6wo0q00f0CQQD8ZTTC4S4hyYJS
-yGVr0Lf2PdaY4gLjkLZnMFePjVQnzQ/wZ1FAbbCznO7FAg5/gtWKiV+KwFPKbqXT
-rmEpra4fAkEA7gWKHPqdx+9vfcVjyQmL7PY1CgH3oWH8KbhZohQbXST2KwRaHF0q
-tKmh2gbc/loU8Eg1kL71Eyp48Q9KWb9b9wJAK/AudDKhRk5/OowaY9+M9vgi8LB/
-0j/yERqwU5RF7zvap35E/dNarJoIUxGdloMfS6PIly4OKDKE+cnkrk3G/wJAaHh7
-9140tJWuLNjfhFSxWs9x1jOo2eelAzbL+Ky0mfxoI9dkKcDmxqcRyB1tECK/v/sh
-r6dw7/mbXcrlSmEIXwJAE0hPm34eYuPv10urR8I2zNMGL6htgTwlKBN6UddtNSEC
-nTDUIxfgghGE7uq2WCZmgAp5TQm+weSsA5RaI4rnDg==
+MIICXgIBAAKBgQDaqOVVDWgXEfIRzoW54l/VmClTlMULNbjt41MNZKCZkQsrvad7
+Jn2u0EepQaY5hTik0wPP2+pzeBnb1zTB6w2ApEz1exz/0Jctkrd5JhiqKrGOvAb/
+YScBemuySArYyu3bod18pQGrvB1DCYuuV421Sh4ofJDJ9754v8FMxI8YwwIDAQAB
+AoGBAKVNs/olpYBzX6aYk74gZkTqwKtgN8qutXyaM6pXXZZa8bACs7/FLJTg/pv1
+dn3buiPZJvOYFNlwfVQWkNrdIRmuvtPOhdacBTcZiYWQ8GesNfwlHwBXCI9vrRq2
+FJh196mHwbRx2b8IsymilQ24TMvwkvEpFqLA02d/igdUokghAkEA8zSVZ1OOE8so
+aSAj45ZcdQJ8hPPDqabacjEHnLXj7rJCof2M1VQwLMj8krLxoMTA29fYzwWF5lpT
+3zWbgS02kwJBAOYpvSItytP2LA5PrSC03Wa+cPJdBBQBmsRaNulcP+CZKiY2e7nh
+1zXN7QOdBTXsCE/A8QXqpl+Omt3HUg1iQxECQQCcyrrDSYfgVOpxk8nvcMGcogS7
+BhiPqEVOtzNMIauX+I6itr7zzXnddZn3zaufVRls4iQhm1Lu5i8KSRo+1nJHAkBg
+lfdmlmzdUhrezpTKetvGN/jR3DLP6nR2HZ2ZhDrSF7RWYNq/AIT9cTMbJxN+s1Qx
+k7gRUY0L4J4gn3pRX4DhAkEA8Unw8+j8wbQ6gH9erqpRSlEtYZePh/cY10h3SBZ3
+eD6ZFqsYIHtAJMVqzSZFuWjBIk0e57RH7NRgfCFPl3VJew==
 -----END RSA PRIVATE KEY-----
 -----BEGIN CERTIFICATE-----
-MIICyDCCAjGgAwIBAgIJAIWuLPvf+I38MA0GCSqGSIb3DQEBBAUAME0xCzAJBgNV
+MIICyDCCAjGgAwIBAgIJAJfoN7qD0W7YMA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV
 BAYTAlVTMQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3QuIExvdWlzMQwwCgYDVQQK
-EwNPQ0kxDzANBgNVBAMTBmNsaWVudDAeFw0wOTA5MDIwOTE0MjdaFw0xMDA5MDIw
-OTE0MjdaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3Qu
+EwNPQ0kxDzANBgNVBAMTBmNsaWVudDAeFw0xMTA4MjIxNTMyMjRaFw0xMjA4MjEx
+NTMyMjRaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3Qu
 IExvdWlzMQwwCgYDVQQKEwNPQ0kxDzANBgNVBAMTBmNsaWVudDCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEA6quNMlXAgLnnMZtjMzfj+q7tP9vLWy6CkbVJq9TM
-xGVMfNZ6UIQqA9rZsiYnz+hHX5tnt6RIlHzhMTPTA4FPyHFlPdJjkTPvfyp0F+sf
-H5cBNUemDWYB6cz3uzxMet146qYKKea8QgIyKhCy0/TUZU/sb8VFgZP/zMxpo6OZ
-BOkCAwEAAaOBrzCBrDAdBgNVHQ4EFgQUr9z2Ep75QKJkVUgBC8NpnKOmX0UwfQYD
-VR0jBHYwdIAUr9z2Ep75QKJkVUgBC8NpnKOmX0WhUaRPME0xCzAJBgNVBAYTAlVT
+9w0BAQEFAAOBjQAwgYkCgYEA2qjlVQ1oFxHyEc6FueJf1ZgpU5TFCzW47eNTDWSg
+mZELK72neyZ9rtBHqUGmOYU4pNMDz9vqc3gZ29c0wesNgKRM9Xsc/9CXLZK3eSYY
+qiqxjrwG/2EnAXprskgK2Mrt26HdfKUBq7wdQwmLrleNtUoeKHyQyfe+eL/BTMSP
+GMMCAwEAAaOBrzCBrDAdBgNVHQ4EFgQUnO1q8yoFZPjmMm0Wu3TJT0gOFuIwfQYD
+VR0jBHYwdIAUnO1q8yoFZPjmMm0Wu3TJT0gOFuKhUaRPME0xCzAJBgNVBAYTAlVT
 MQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3QuIExvdWlzMQwwCgYDVQQKEwNPQ0kx
-DzANBgNVBAMTBmNsaWVudIIJAIWuLPvf+I38MAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQEEBQADgYEAGD6R4borxgxTJHHgKe5+xfYMVTLVVqS2Ku3inlzSIFaPXrbl
-Y/WEN3rUUWUf7RU0vhbiVS14hBCTgd9Y6STBC8dkbSBb979VPWefUgQc21/O6bO6
-zCNm0f4EHvYyxDANtlVOIiYn7KaM4SQUT1u3kVH2M5uD3NABLgdutE1297I=
+DzANBgNVBAMTBmNsaWVudIIJAJfoN7qD0W7YMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQEFBQADgYEArzMbOXyqBde8fjozyOOWEQcP+MppUbOVAXfdntbDwVYEld7S
+PofHVJ9jMNFN3HR5B7/5+NcwQRX6qivudMA5CXGyBTkH8Eeuth9E76tb6QJv8nTX
+bnIkk87foDoTxjHNkeBsNV89k2lMF721084yaISR4JJAJ5tRU0xXOzNkkpw=
 -----END CERTIFICATE-----
diff --git a/orbsvcs/tests/Security/BiDirectional/ssl/server-cert.pem b/orbsvcs/tests/Security/BiDirectional/ssl/server-cert.pem
index 71994081f3e..5438e2a4dda 100644
--- a/orbsvcs/tests/Security/BiDirectional/ssl/server-cert.pem
+++ b/orbsvcs/tests/Security/BiDirectional/ssl/server-cert.pem
@@ -1,17 +1,17 @@
 -----BEGIN CERTIFICATE-----
-MIICyDCCAjGgAwIBAgIJAOtnDNOy1r76MA0GCSqGSIb3DQEBBAUAME0xCzAJBgNV
+MIICyDCCAjGgAwIBAgIJAJLBvLx9WUXKMA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV
 BAYTAlVTMQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3QuIExvdWlzMQwwCgYDVQQK
-EwNPQ0kxDzANBgNVBAMTBnNlcnZlcjAeFw0wOTA5MDIwOTE0MjdaFw0xMDA5MDIw
-OTE0MjdaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3Qu
+EwNPQ0kxDzANBgNVBAMTBnNlcnZlcjAeFw0xMTA4MjIxNTMyMjNaFw0xMjA4MjEx
+NTMyMjNaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3Qu
 IExvdWlzMQwwCgYDVQQKEwNPQ0kxDzANBgNVBAMTBnNlcnZlcjCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEAtgLRQTR0cglW88zdM0KU/Umx1ma6U3i9OxSZWJng
-mDtfZGxKDDzROAUg2pnxzaXbbPxatFKBPb/NhzPXHZUK6qfBmwmiH+APoHMuKBmn
-izL2Jt2V8LNzCmJcHPDJJuG7usdBH36CUuC33Z6BPxwLLYkTGT5lUkICWlduZRid
-BssCAwEAAaOBrzCBrDAdBgNVHQ4EFgQU+KYirnLzyICLQxyEybtrOvJ8ekEwfQYD
-VR0jBHYwdIAU+KYirnLzyICLQxyEybtrOvJ8ekGhUaRPME0xCzAJBgNVBAYTAlVT
+9w0BAQEFAAOBjQAwgYkCgYEAzqVyUomhG3Zjvn6up7p2QCtjVOWMzeVr1aWYu2Ce
+W+ts/bwhmLVnp2qiANYQbQF47sHkxtL3KYa3aQy2JFwmJqPa4k478mg/316Fy9Yc
+MxL7l9rDC3GLdSyq4M6xqtYz12RepUydFwGfphvpL7augq/iKOjYsotezpUH87Ok
+vtkCAwEAAaOBrzCBrDAdBgNVHQ4EFgQUE+ZKmmcNsspWePyp/z0dRJor4IowfQYD
+VR0jBHYwdIAUE+ZKmmcNsspWePyp/z0dRJor4IqhUaRPME0xCzAJBgNVBAYTAlVT
 MQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3QuIExvdWlzMQwwCgYDVQQKEwNPQ0kx
-DzANBgNVBAMTBnNlcnZlcoIJAOtnDNOy1r76MAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQEEBQADgYEAac1LPqFHgE04iIltUtwvDd5KaSkbkwRCJ3xA8BACIimFYyoY
-2uahz4c/9F/3rw2oAil5b7RN+9RnGSVZYwYRd6z1sul5URiWQ7sQ3ZfVrS7pOhbE
-nephLwFScEOdW7GaQcCkexqgvQaXACgQMEGDKkzgbTmXmVbwQbzbWqWbSx8=
+DzANBgNVBAMTBnNlcnZlcoIJAJLBvLx9WUXKMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQEFBQADgYEALoJCh6ZO52X3BfO/WbuBmvLbjwoX5LQdR+P/Ckz5ZKNdVTSI
+SkDDS+DUB77DMstAq65kcfq+gFwedb2k82Uk1TkenQ0BX3dBkAO2w5M2ipqHN2ez
+3kQ//pzWh/+k8QNgbQSwxKA2UwkbXBhDc2KbT+klhqCGA2hl0KySImgX5Jk=
 -----END CERTIFICATE-----
diff --git a/orbsvcs/tests/Security/BiDirectional/ssl/server-key.pem b/orbsvcs/tests/Security/BiDirectional/ssl/server-key.pem
index 0ef9a7b80f2..673dcab56db 100644
--- a/orbsvcs/tests/Security/BiDirectional/ssl/server-key.pem
+++ b/orbsvcs/tests/Security/BiDirectional/ssl/server-key.pem
@@ -1,32 +1,32 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQC2AtFBNHRyCVbzzN0zQpT9SbHWZrpTeL07FJlYmeCYO19kbEoM
-PNE4BSDamfHNpdts/Fq0UoE9v82HM9cdlQrqp8GbCaIf4A+gcy4oGaeLMvYm3ZXw
-s3MKYlwc8Mkm4bu6x0EffoJS4LfdnoE/HAstiRMZPmVSQgJaV25lGJ0GywIDAQAB
-AoGBALGlLFHk/aZz4S9Ri7BFUx+oNu/ZEhD4blFkuIrWnXRXtrJQUzGAhn+T2c4i
-pPQf5nuIDoujX0tCkjpc6Z+Q4bYhQFuWl0Q11hZ0T/QAUxMVgnLrAqivp7NePN+P
-tkO6IJrZjWfO3AQy0TM3/VKQpVH2QmQqKUDr/d9rG21t9z0RAkEA6kTLEx68YHGG
-2lPURn7nMVlUdPonyAslEmH8P+YKT3W564VDgH6117/d3V+T0rlfqUK5XBnMxfDi
-hCHSTdF3kwJBAMblDdMxyvd4TVoOjwpEwiYAmk7gS6de/7Dqx7U8/KwgUqV8tRX9
-7x/lS/KEMFG8kniyN2M6U+N3Ma3Z66nHRukCQQCJjeUzj9uKQX6uGYTN89uqNUqK
-+Qt8wVZ+KbykhF1PdM+7A9+zxjLdwNH0FxfEJoaN6xjNhHShUSSf8v/6I2EzAkAi
-nAEH2wZCgcCUByyE0OonyrsPNqBzg2hi1LfjpbUiDo3TFhw8s29E0ZWhobb2wiWK
-sxhIQAIQ9tDCO8VySabhAkBqPcB85wnFbzasc24V3tXkEczCKXYeRcYPP7hZXeUr
-QqhRFE9w80FdSpmUAwHcRn4/MAu2rsGJXBxNqrY0RpuV
+MIICXQIBAAKBgQDOpXJSiaEbdmO+fq6nunZAK2NU5YzN5WvVpZi7YJ5b62z9vCGY
+tWenaqIA1hBtAXjuweTG0vcphrdpDLYkXCYmo9riTjvyaD/fXoXL1hwzEvuX2sML
+cYt1LKrgzrGq1jPXZF6lTJ0XAZ+mG+kvtq6Cr+Io6Niyi17OlQfzs6S+2QIDAQAB
+AoGBAM3ZOZzGxNoagRnOECW9NPaPQg/b6vtfwp+8qfxeLuHaD2Ri+ASrEGpRarfy
+hcJQaStNspvso5GWRTY8F2T49nZVDa2gKstfKAVFVUXkIcDUxbBeDgE294+5bhvQ
+8wzzCaHo8N//csfK40wjZkXjKu9tMN1YO0bPnUg+jAUh5kjRAkEA6e1kzuI/TXYT
+FOJEYXe6iMxkd7tnFJH9C6OP+oLQ5EEU/fzs2Denr2N4qGP/6t70K2Dox9tlChEg
+rtfE/974dwJBAOIlEYc5B2fSPCpqP9i/Xg2WB3gN91GpjsZUM0QGE+jrShljJOrX
+QB4ZxI2QaY87Gcl42VKxm/OiISvUeL69Jy8CQFlSC+vy97jcHO0ceH++97rEUJhn
+NjTkiXqoOZGt4ZVGRH221bi5h42wraGejVlhSFpH5pppa2ssnw4j1VTeDoECQEA6
+EOlbvAuzfNz7AhkX+KlZI9Pn+4bY5jDTtx+prjvnn0roipKcAZzK6rTd/+zq9x7u
+UKKYyNcAA/XDyWs6o4cCQQCZpu6c99L3O7MfdSCkqaJyybHAURAxrt3r50VTGg+z
+52LZUCv0UD9aeHrOEkaw8RFriuEiKGRmb8iuqqhNSJ7w
 -----END RSA PRIVATE KEY-----
 -----BEGIN CERTIFICATE-----
-MIICyDCCAjGgAwIBAgIJAOtnDNOy1r76MA0GCSqGSIb3DQEBBAUAME0xCzAJBgNV
+MIICyDCCAjGgAwIBAgIJAJLBvLx9WUXKMA0GCSqGSIb3DQEBBQUAME0xCzAJBgNV
 BAYTAlVTMQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3QuIExvdWlzMQwwCgYDVQQK
-EwNPQ0kxDzANBgNVBAMTBnNlcnZlcjAeFw0wOTA5MDIwOTE0MjdaFw0xMDA5MDIw
-OTE0MjdaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3Qu
+EwNPQ0kxDzANBgNVBAMTBnNlcnZlcjAeFw0xMTA4MjIxNTMyMjNaFw0xMjA4MjEx
+NTMyMjNaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3Qu
 IExvdWlzMQwwCgYDVQQKEwNPQ0kxDzANBgNVBAMTBnNlcnZlcjCBnzANBgkqhkiG
-9w0BAQEFAAOBjQAwgYkCgYEAtgLRQTR0cglW88zdM0KU/Umx1ma6U3i9OxSZWJng
-mDtfZGxKDDzROAUg2pnxzaXbbPxatFKBPb/NhzPXHZUK6qfBmwmiH+APoHMuKBmn
-izL2Jt2V8LNzCmJcHPDJJuG7usdBH36CUuC33Z6BPxwLLYkTGT5lUkICWlduZRid
-BssCAwEAAaOBrzCBrDAdBgNVHQ4EFgQU+KYirnLzyICLQxyEybtrOvJ8ekEwfQYD
-VR0jBHYwdIAU+KYirnLzyICLQxyEybtrOvJ8ekGhUaRPME0xCzAJBgNVBAYTAlVT
+9w0BAQEFAAOBjQAwgYkCgYEAzqVyUomhG3Zjvn6up7p2QCtjVOWMzeVr1aWYu2Ce
+W+ts/bwhmLVnp2qiANYQbQF47sHkxtL3KYa3aQy2JFwmJqPa4k478mg/316Fy9Yc
+MxL7l9rDC3GLdSyq4M6xqtYz12RepUydFwGfphvpL7augq/iKOjYsotezpUH87Ok
+vtkCAwEAAaOBrzCBrDAdBgNVHQ4EFgQUE+ZKmmcNsspWePyp/z0dRJor4IowfQYD
+VR0jBHYwdIAUE+ZKmmcNsspWePyp/z0dRJor4IqhUaRPME0xCzAJBgNVBAYTAlVT
 MQswCQYDVQQIEwJNTzESMBAGA1UEBxMJU3QuIExvdWlzMQwwCgYDVQQKEwNPQ0kx
-DzANBgNVBAMTBnNlcnZlcoIJAOtnDNOy1r76MAwGA1UdEwQFMAMBAf8wDQYJKoZI
-hvcNAQEEBQADgYEAac1LPqFHgE04iIltUtwvDd5KaSkbkwRCJ3xA8BACIimFYyoY
-2uahz4c/9F/3rw2oAil5b7RN+9RnGSVZYwYRd6z1sul5URiWQ7sQ3ZfVrS7pOhbE
-nephLwFScEOdW7GaQcCkexqgvQaXACgQMEGDKkzgbTmXmVbwQbzbWqWbSx8=
+DzANBgNVBAMTBnNlcnZlcoIJAJLBvLx9WUXKMAwGA1UdEwQFMAMBAf8wDQYJKoZI
+hvcNAQEFBQADgYEALoJCh6ZO52X3BfO/WbuBmvLbjwoX5LQdR+P/Ckz5ZKNdVTSI
+SkDDS+DUB77DMstAq65kcfq+gFwedb2k82Uk1TkenQ0BX3dBkAO2w5M2ipqHN2ez
+3kQ//pzWh/+k8QNgbQSwxKA2UwkbXBhDc2KbT+klhqCGA2hl0KySImgX5Jk=
 -----END CERTIFICATE-----