summaryrefslogtreecommitdiff
path: root/cpp/src/IceSSL/PluginI.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/IceSSL/PluginI.cpp')
-rw-r--r--cpp/src/IceSSL/PluginI.cpp24
1 files changed, 15 insertions, 9 deletions
diff --git a/cpp/src/IceSSL/PluginI.cpp b/cpp/src/IceSSL/PluginI.cpp
index e00993a6af0..c391cb5d008 100644
--- a/cpp/src/IceSSL/PluginI.cpp
+++ b/cpp/src/IceSSL/PluginI.cpp
@@ -9,6 +9,7 @@
#include <PluginI.h>
#include <Instance.h>
+#include <TransceiverI.h>
#include <Util.h>
#include <Ice/BuiltinSequences.h>
#include <Ice/Communicator.h>
@@ -18,7 +19,6 @@
#include <IceUtil/StaticMutex.h>
#include <Ice/ConnectionI.h> // For implementation of getConnectionInfo.
-#include <IceSSL/TransceiverI.h> // For implementation of getConnectionInfo.
#include <openssl/crypto.h>
#include <openssl/err.h>
@@ -99,6 +99,12 @@ IceSSL::PluginI::PluginI(const Ice::CommunicatorPtr& communicator)
}
void
+IceSSL::PluginI::initialize()
+{
+ _instance->initialize();
+}
+
+void
IceSSL::PluginI::destroy()
{
_instance->destroy();
@@ -108,9 +114,15 @@ IceSSL::PluginI::destroy()
}
void
-IceSSL::PluginI::initialize(SSL_CTX* context)
+IceSSL::PluginI::setContext(SSL_CTX* context)
+{
+ _instance->context(context);
+}
+
+SSL_CTX*
+IceSSL::PluginI::getContext()
{
- _instance->initialize(context);
+ return _instance->context();
}
void
@@ -125,12 +137,6 @@ IceSSL::PluginI::setPasswordPrompt(const PasswordPromptPtr& prompt)
_instance->setPasswordPrompt(prompt);
}
-SSL_CTX*
-IceSSL::PluginI::context()
-{
- return _instance->context()->ctx();
-}
-
void
IceSSL::PluginI::setupSSL(const CommunicatorPtr& communicator)
{