diff options
author | Mark Spruiell <mes@zeroc.com> | 2002-04-26 02:53:33 +0000 |
---|---|---|
committer | Mark Spruiell <mes@zeroc.com> | 2002-04-26 02:53:33 +0000 |
commit | 0d715a1edd4484c9b7074c9c3cb283d468a538bc (patch) | |
tree | 45934688c11aa189731ae51f07032050affd12ef /cpp/src/IceSSL/SslConnectionOpenSSL.cpp | |
parent | Win32 fix (diff) | |
download | ice-0d715a1edd4484c9b7074c9c3cb283d468a538bc.tar.bz2 ice-0d715a1edd4484c9b7074c9c3cb283d468a538bc.tar.xz ice-0d715a1edd4484c9b7074c9c3cb283d468a538bc.zip |
Renaming Ice.Trace.Security to IceSSL.Trace.Security Cleaning up IceSSL
dependencies on Ice core
Diffstat (limited to 'cpp/src/IceSSL/SslConnectionOpenSSL.cpp')
-rw-r--r-- | cpp/src/IceSSL/SslConnectionOpenSSL.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/cpp/src/IceSSL/SslConnectionOpenSSL.cpp b/cpp/src/IceSSL/SslConnectionOpenSSL.cpp index b06f6cc95a2..8d916eee26e 100644 --- a/cpp/src/IceSSL/SslConnectionOpenSSL.cpp +++ b/cpp/src/IceSSL/SslConnectionOpenSSL.cpp @@ -18,7 +18,6 @@ #endif #include <Ice/Network.h> -#include <Ice/TraceLevels.h> #include <Ice/Logger.h> #include <Ice/LocalException.h> @@ -29,6 +28,7 @@ #include <IceSSL/OpenSSLPluginI.h> #include <IceSSL/CertificateVerifierOpenSSL.h> #include <IceSSL/OpenSSLUtils.h> +#include <IceSSL/TraceLevels.h> #include <openssl/err.h> @@ -60,12 +60,10 @@ void IceInternal::decRef(IceSSL::OpenSSL::Connection* p) { p->__decRef(); } // but unfortunately, it appears that this is not properly picked up. // -IceSSL::OpenSSL::Connection::Connection(const TraceLevelsPtr& traceLevels, - const LoggerPtr& logger, - const IceSSL::CertificateVerifierPtr& certificateVerifier, +IceSSL::OpenSSL::Connection::Connection(const IceSSL::CertificateVerifierPtr& certificateVerifier, SSL* sslConnection, const PluginBaseIPtr& plugin) : - IceSSL::Connection(traceLevels, logger, certificateVerifier), + IceSSL::Connection(plugin->getTraceLevels(), plugin->getLogger(), certificateVerifier), _sslConnection(sslConnection) { assert(_sslConnection != 0); |