1 files changed, 3 insertions, 0 deletions
diff --git a/cpp/src/IceSSL/OpenSSLPluginI.cpp b/cpp/src/IceSSL/OpenSSLPluginI.cpp
index b4cc3d60bac..1e8e1abbe30 100644
--- a/cpp/src/IceSSL/OpenSSLPluginI.cpp
+++ b/cpp/src/IceSSL/OpenSSLPluginI.cpp
@@ -232,6 +232,7 @@ IceSSL::OpenSSLPluginI::~OpenSSLPluginI()
 
     ERR_free_strings();
     unregisterThreads();
+    ERR_remove_state(0);
 
     EVP_cleanup();
 
@@ -640,6 +641,8 @@ IceSSL::OpenSSLPluginI::setCertificateVerifier(ContextType contextType,
         throw cvtEx;
     }
 
+    castVerifier->setContext(contextType);
+
     if(contextType == Client || contextType == ClientServer)
     {
         _clientContext.setCertificateVerifier(castVerifier);