diff options
| author | Jose <jose@zeroc.com> | 2014-08-07 01:00:42 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-08-07 01:00:42 +0200 |
| commit | d86ef31c63190285dda3233b8ee2cb5d381c7686 (patch) | |
| tree | 653d33813fef2d5997916d8462f516646af919c3 /cpp/src/IceSSL/PluginI.cpp | |
| parent | updating .depend files (diff) | |
| download | ice-d86ef31c63190285dda3233b8ee2cb5d381c7686.tar.bz2 ice-d86ef31c63190285dda3233b8ee2cb5d381c7686.tar.xz ice-d86ef31c63190285dda3233b8ee2cb5d381c7686.zip | |
Windows SSL SChannel implementation & OS X Secure Transport fixes.
Diffstat (limited to 'cpp/src/IceSSL/PluginI.cpp')
| -rw-r--r-- | cpp/src/IceSSL/PluginI.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cpp/src/IceSSL/PluginI.cpp b/cpp/src/IceSSL/PluginI.cpp index 5a39e3ee93f..145089d026e 100644 --- a/cpp/src/IceSSL/PluginI.cpp +++ b/cpp/src/IceSSL/PluginI.cpp @@ -9,7 +9,6 @@ #include <IceSSL/PluginI.h> #include <IceSSL/Instance.h> -#include <IceSSL/TransceiverI.h> #include <IceSSL/SSLEngine.h> #include <IceSSL/EndpointI.h> #include <IceSSL/EndpointInfo.h> @@ -41,10 +40,12 @@ createIceSSL(const CommunicatorPtr& communicator, const string& /*name*/, const // IceSSL::PluginI::PluginI(const Ice::CommunicatorPtr& communicator) { -#ifdef ICE_USE_OPENSSL - _engine = new OpenSSLEngine(communicator); -#else +#if defined(ICE_USE_SECURE_TRANSPORT) _engine = new SecureTransportEngine(communicator); +#elif defined(ICE_USE_SCHANNEL) + _engine = new SChannelEngine(communicator); +#else + _engine = new OpenSSLEngine(communicator); #endif IceInternal::ProtocolPluginFacadePtr facade = IceInternal::getProtocolPluginFacade(communicator); |