From 3a0d69bbfe48f57128565f4bdd13777ca3a0d5c4 Mon Sep 17 00:00:00 2001 From: CryptoManiac Date: Sun, 13 Mar 2016 00:39:26 +0300 Subject: [PATCH] Revert "openssl: avoid config file load/race (see bitcoin d4b1d5a)" This reverts commit a303a6ee32ebc04eb261db780f1e968f58d6e260. This feature was made deprecated ages ago. --- src/util.cpp | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/src/util.cpp b/src/util.cpp index 0a19fe9..80186e5 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -31,7 +31,6 @@ namespace boost { #include #include #include -#include #ifdef WIN32 #ifdef _WIN32_WINNT @@ -122,13 +121,6 @@ public: ppmutexOpenSSL[i] = new CCriticalSection(); CRYPTO_set_locking_callback(locking_callback); - // OpenSSL can optionally load a config file which lists optional loadable modules and engines. - // We don't use them so we don't require the config. However some of our libs may call functions - // which attempt to load the config file, possibly resulting in an exit() or crash if it is missing - // or corrupt. Explicitly tell OpenSSL not to try to load the file. The result for our libs will be - // that the config appears to have been loaded and there are no modules/engines available. - OPENSSL_no_config(); - #ifdef WIN32 // Seed random number generator with screen scrape and other hardware sources RAND_screen(); -- 1.7.1