1 files changed, 10 insertions, 34 deletions

diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
index d22485f2af1..286959c539d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "SSLIOP_ClientCredentials.h"
-#include "SSLIOP_OwnCredentials.h"
 
 
 ACE_RCSID (SSLIOP,
@@ -9,12 +8,8 @@ ACE_RCSID (SSLIOP,
            "$Id$")
 
 
-TAO::SSLIOP::ClientCredentials::ClientCredentials (
-  X509 * cert,
-  EVP_PKEY *evp,
-  SSL * ssl)
-  : SSLIOP_Credentials (cert, evp),
-    ssl_ (TAO::SSLIOP::OpenSSL_traits< ::SSL >::_duplicate (ssl))
+TAO::SSLIOP::ClientCredentials::ClientCredentials (X509 *cert, EVP_PKEY *evp)
+  : TAO::SSLIOP::Credentials (cert, evp)
 {
 }
 
@@ -86,53 +81,34 @@ SecurityLevel3::OwnCredentials_ptr
 TAO::SSLIOP::ClientCredentials::parent_credentials (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  SecurityLevel3::OwnCredentials_ptr creds =
-    SecurityLevel3::OwnCredentials::_nil ();
-
-  ACE_NEW_THROW_EX (creds,
-                    TAO::SSLIOP::OwnCredentials (
-                      ::SSL_get_certificate (this->ssl_.in ()),
-                      ::SSL_get_privatekey (this->ssl_.in ())),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (creds);
-
-  return creds;
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (),
+                    SecurityLevel3::OwnCredentials::_nil ());
 }
 
 CORBA::Boolean
-TAO::SSLIOP::ClientCredentials::client_authentication (
-    ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SSLIOP::ClientCredentials::client_authentication (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  // If the client presented no certificate (i.e. cert_.ptr() == 0),
-  // the client was not authenticated.  Otherwise, verify the peer's
-  // certificate.
-
-  return
-    this->x509_.in () != 0
-    && SSL_get_verify_result (this->ssl_.in ()) == X509_V_OK;
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 CORBA::Boolean
 TAO::SSLIOP::ClientCredentials::target_authentication (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), false);
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 CORBA::Boolean
 TAO::SSLIOP::ClientCredentials::confidentiality (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), false);
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
 CORBA::Boolean
-TAO::SSLIOP::ClientCredentials::integrity (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+TAO::SSLIOP::ClientCredentials::integrity (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  // TAO's SSLIOP pluggable transport always provides integrity.  Note
-  // that if we 
-
-  return true;
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }