omniorb-dfsg (4.1.3-1) src/lib/omniORB/orbcore/ssl/sslContext.cc

--- omniorb-dfsg-4.1.3.orig/src/lib/omniORB/orbcore/ssl/sslContext.cc
+++ omniorb-dfsg-4.1.3/src/lib/omniORB/orbcore/ssl/sslContext.cc
@@ -118,19 +118,42 @@
 
 sslContext* sslContext::singleton = 0;
 
+static sslContext* ssl_owner = 0;
+
+static bool become_ssl_owner(sslContext* context) {
+  bool become_owner = false;
+
+  if (ssl_owner == 0 && CRYPTO_get_locking_callback() == 0) {
+    ssl_owner = context;
+    become_owner = true;
+  }
+
+  return become_owner;
+}
+
+static bool was_ssl_owner(sslContext* context) {
+  bool was_owner = false;
+
+  if (ssl_owner != 0 && ssl_owner == context) {
+    was_owner = true;
+    ssl_owner = 0;
+  }
+
+  return was_owner;
+}
 
 /////////////////////////////////////////////////////////////////////////
 sslContext::sslContext(const char* cafile,
 		       const char* keyfile,
 		       const char* password) :
   pd_cafile(cafile), pd_keyfile(keyfile), pd_password(password), pd_ctx(0),
-  pd_locks(0), pd_ssl_owner(0) {}
+  pd_locks(0) {}
 
 
 /////////////////////////////////////////////////////////////////////////
 sslContext::sslContext() :
   pd_cafile(0), pd_keyfile(0), pd_password(0), pd_ctx(0),
-  pd_locks(0), pd_ssl_owner(0) {
+  pd_locks(0) {
 }
 
 /////////////////////////////////////////////////////////////////////////
@@ -140,7 +163,7 @@
   if (pd_ctx) return;
 
   // Assume we own the ssl if no locking callback yet.
-  pd_ssl_owner = CRYPTO_get_locking_callback() == 0;
+  bool pd_ssl_owner = become_ssl_owner(this);
 
   if (pd_ssl_owner) {
     SSL_library_init();
@@ -172,7 +195,7 @@
   if (pd_ctx) {
     SSL_CTX_free(pd_ctx);
   }
-  if (pd_ssl_owner)
+  if (was_ssl_owner(this))
     thread_cleanup();
 }