@@ -3,12 +3,10 @@
  * some modifications:
  *	Copyright (C) 2000 Ajuba Solutions
  *	Copyright (C) 2002 ActiveState Corporation
  *	Copyright (C) 2004 Starfish Systems 
  *
- * $Header: /home/rkeene/tmp/cvs2fossil/../tcltls/tls/tls/tls.c,v 1.37 2015/07/07 17:16:02 andreas_kupries Exp $
- *
  * TLS (aka SSL) Channel - can be layered on any bi-directional
  * Tcl_Channel (Note: Requires Trf Core Patch)
  *
  * This was built (almost) from scratch based upon observation of
  * OpenSSL 0.9.2B
@@ -1774,14 +1772,18 @@
     char rnd_seed[16] = "GrzSlplKqUdnnzP!";	/* 16 bytes */
     int status=TCL_OK;
 #if defined(OPENSSL_THREADS) && defined(TCL_THREADS)
     size_t num_locks;
 
-    if (!initialized) {
+    if (initialized) {
+        return status;
+    }
 	Tcl_MutexLock(&init_mx);
 	if (!initialized) {
 	    initialized = 1;
+#else
+       {
 #endif
 
 	    if (CRYPTO_set_mem_functions((void *(*)(size_t))Tcl_Alloc,
 					 (void *(*)(void *, size_t))Tcl_Realloc,
 					 (void(*)(void *))Tcl_Free) == 0) {
@@ -1823,13 +1825,13 @@
 		    rnd_seed[i] = 1 + (char) (255.0 * rand()/(RAND_MAX+1.0));
 		}
 		RAND_seed(rnd_seed, sizeof(rnd_seed));
 	    } while (RAND_status() != 1);
 	}
-    	done:
+
+done:
 
 #if defined(OPENSSL_THREADS) && defined(TCL_THREADS)
 	Tcl_MutexUnlock(&init_mx);
 #endif
-    }
     return status;
 }