1 files changed, 49 insertions, 1 deletions
diff --git a/cpp/src/Ice/SslFactory.cpp b/cpp/src/Ice/SslFactory.cpp
index 54e0af0a8fc..45d962adb9e 100644
--- a/cpp/src/Ice/SslFactory.cpp
+++ b/cpp/src/Ice/SslFactory.cpp
@@ -12,22 +12,70 @@
 #endif
 
 #include <Ice/SslFactory.h>
-#include <Ice/SslSystemOpenSSL.h>
+#include <Ice/SslSystemOpenSSL.h>
+#include <Ice/Security.h>
+
+#define OPENSSL_THREAD_DEFINES
+#include <openssl/opensslconf.h>
+#if defined(THREADS)
+#else
+#error "Thread support not enabled"
+#endif
+
 
 namespace IceSecurity
 {
 
 namespace Ssl
 {
+
+
+extern "C"
+{
+    void lockingCallback(int, int, const char*, int);
+}
 
 // Static member instantiations.
 JTCMutex Factory::_systemRepositoryMutex;
 SystemMap Factory::_systemRepository;
 SslHandleSystemMap Factory::_sslHandleSystemRepository;
+
+class SslLockKeeper
+{
+
+public:
+    SslLockKeeper()
+    {
+        CRYPTO_set_locking_callback((void (*)(int, int, const char*, int))lockingCallback);
+    }
+
+    ~SslLockKeeper()
+    {
+        CRYPTO_set_locking_callback(NULL);
+    }
+
+    JTCMutex sslLocks[CRYPTO_NUM_LOCKS];
+
+};
+
+SslLockKeeper lockKeeper;
 
 }
 
 }
+
+void IceSecurity::Ssl::lockingCallback(int mode, int type, const char *file, int line)
+{
+    if (mode & CRYPTO_LOCK)
+    {
+        lockKeeper.sslLocks[type].lock();
+    }
+    else
+    {
+        lockKeeper.sslLocks[type].unlock();
+    }
+}
+
 
 IceSecurity::Ssl::System*
 IceSecurity::Ssl::Factory::getSystem(string& systemIdentifier)