diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-12-03 22:36:54 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-12-03 22:36:54 +0000 |
| commit | a53921802a268dcfc2eb9f15e6fb79977e1b52c5 (patch) | |
| tree | 908e3eefb9bd831384b50da9df415b9083e74ae0 | |
| parent | e10367f8503203365bb3ef27785517403b343e2f (diff) | |
| download | ATCD-a53921802a268dcfc2eb9f15e6fb79977e1b52c5.tar.gz | |
ChangeLogTag:Mon Dec 3 14:32:05 2001 Ossama Othman <ossama@uci.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 12 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp | 10 |
2 files changed, 22 insertions, 0 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 54465837818..8bb49eee211 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,15 @@ +Mon Dec 3 14:32:05 2001 Ossama Othman <ossama@uci.edu> + + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp (connect): + + Added support for the + Security::SecQOPIntegrityAndConfidentiality value for the + SecurityLevel2::QOPPolicy policy. This policy setting forces + invocations using a specific object reference with that policy + override in place to be protected. Thanks to Gaoyan Xie + <gxie@eecs.wsu.edu> for asking a question that made it obvious + that this feature was missing. + Mon Dec 3 11:43:40 2001 Carlos O'Ryan <coryan@uci.edu> * tests/LongUpcalls/run_test.pl: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index 06d86ea2d2a..17d5a93ae45 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -216,6 +216,8 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation, if (qop == Security::SecQOPNoProtection) no_protection = 1; + else if (qop == Security::SecQOPIntegrityAndConfidentiality) + no_protection = 0; } // If the SSL port is zero, then no SSLIOP tagged component was @@ -386,6 +388,14 @@ TAO_SSLIOP_Connector::ssliop_connect (TAO_SSLIOP_Endpoint *ssl_endpoint, const ACE_INET_Addr &remote_address = ssl_endpoint->object_addr (); +#if 0 + ACE_DEBUG ((LM_DEBUG, + "********** SSLIOP_Connector -- port from addr = %u\n" + "********** SSLIOP_Connector -- port from ssl = %u\n", + remote_address.get_port_number (), + ssl_component.port)); +#endif /* 0 */ + // Verify that the remote ACE_INET_Addr was initialized // properly. Failure can occur if hostname lookup failed when // initializing the remote ACE_INET_Addr. |