From ea700d80f5d65f7d6c4cab4ccd09192467b15204 Mon Sep 17 00:00:00 2001
From: Vincent Richard <vincent@vincent-richard.net>
Date: Mon, 13 May 2013 16:05:56 +0200
Subject: Cross-platform and (truly) thread-safe OpenSSL initialization.

---
 src/security/cert/openssl/X509Certificate_OpenSSL.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/security/cert/openssl/X509Certificate_OpenSSL.cpp')

diff --git a/src/security/cert/openssl/X509Certificate_OpenSSL.cpp b/src/security/cert/openssl/X509Certificate_OpenSSL.cpp
index 056631ec..20df3739 100644
--- a/src/security/cert/openssl/X509Certificate_OpenSSL.cpp
+++ b/src/security/cert/openssl/X509Certificate_OpenSSL.cpp
@@ -59,6 +59,9 @@ namespace security {
 namespace cert {
 
 
+static net::tls::OpenSSLInitializer::autoInitializer openSSLInitializer;
+
+
 #ifndef VMIME_BUILDING_DOC
 
 class monthMap
@@ -107,9 +110,6 @@ struct OpenSSLX509CertificateInternalData
 {
 	OpenSSLX509CertificateInternalData()
 	{
-		// Thread-safe OpenSSL initialization
-		static net::tls::OpenSSLInitializer openSSLInitialization;
-
 		cert = 0;
 	}
 
-- 
cgit v1.2.3