diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp index 5e90c389e80..0bac6e26251 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp @@ -1,22 +1,15 @@ -#include "orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h" +#include "SSLIOP_Invocation_Interceptor.h" -#include "orbsvcs/SecurityLevel2C.h" - -#include "tao/ORB_Constants.h" -#include "tao/PortableServer/PS_CurrentC.h" #include "tao/debug.h" -#if defined(SSLIOP_DEBUG_PEER_CERTIFICATE) -#include <openssl/x509.h> // @@ For debugging code below -#endif /* DEBUG_PEER_CERTIFICATES */ +// #include <openssl/x509.h> // @@ For debugging code below + ACE_RCSID (SSLIOP, SSLIOP_Invocation_Interceptor, "$Id$") -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - TAO::SSLIOP::Server_Invocation_Interceptor::Server_Invocation_Interceptor ( ::SSLIOP::Current_ptr current, ::Security::QOP qop) @@ -48,7 +41,7 @@ TAO::SSLIOP::Server_Invocation_Interceptor::destroy ( void TAO::SSLIOP::Server_Invocation_Interceptor::receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr /*ri*/ + PortableInterceptor::ServerRequestInfo_ptr /* ri */ ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) @@ -62,17 +55,14 @@ TAO::SSLIOP::Server_Invocation_Interceptor::receive_request_service_contexts ( // SecTargetSecureInvocationPolicy so that we can // accept or reject requests on a per-object basis // instead on a per-endpoint basis. - CORBA::Boolean const no_ssl = + CORBA::Boolean no_ssl = this->ssliop_current_->no_context (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - if (TAO_debug_level >= 3) - ACE_DEBUG ((LM_DEBUG, "SSLIOP (%P|%t) Interceptor (context), ssl=%d\n", !(no_ssl))); - if (no_ssl && this->qop_ != ::Security::SecQOPNoProtection) ACE_THROW (CORBA::NO_PERMISSION ()); -#if defined(DEBUG_PEER_CERTIFICATES) +#if 0 ACE_TRY { // If the request was not made through an SSL connection, then @@ -94,7 +84,7 @@ TAO::SSLIOP::Server_Invocation_Interceptor::receive_request_service_contexts ( X509 *peer = ::d2i_X509 (0, &der_cert, cert->length ()); if (peer != 0) { - char buf[BUFSIZ] = { 0 }; + char buf[BUFSIZ]; ::X509_NAME_oneline (::X509_get_subject_name (peer), buf, @@ -133,10 +123,9 @@ TAO::SSLIOP::Server_Invocation_Interceptor::receive_request_service_contexts ( } ACE_ENDTRY; ACE_CHECK; -#endif /* DEBUG_PEER_CERTIFICATES */ +#endif /* 0 */ } - void TAO::SSLIOP::Server_Invocation_Interceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr /* ri */ @@ -171,5 +160,3 @@ TAO::SSLIOP::Server_Invocation_Interceptor::send_other ( PortableInterceptor::ForwardRequest)) { } - -TAO_END_VERSIONED_NAMESPACE_DECL |