diff options
author | Cory Fields <cory-nospam-@coryfields.com> | 2015-07-14 17:38:03 -0400 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-17 09:16:57 +0200 |
commit | 7e66e9c97bf270b551ab40ae84078a37a8a05586 (patch) | |
tree | bf8dad4f6ecb704e3babeaef475582c348824371 | |
parent | 3f5563877a493a3a2060659ebe4b7aae62a17d84 (diff) |
openssl: avoid config file load/race
Rebased-From: d4b1d5a8baf18e4c8d62846360c0c1c0c9331d70
Github-Pull: #6438
-rw-r--r-- | src/util.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/util.cpp b/src/util.cpp index 3316c172a7..d789e05ecb 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -78,6 +78,7 @@ #include <boost/thread.hpp> #include <openssl/crypto.h> #include <openssl/rand.h> +#include <openssl/conf.h> // Work around clang compilation problem in Boost 1.46: // /usr/include/boost/program_options/detail/config_file.hpp:163:17: error: call to function 'to_internal' that is neither visible in the template definition nor found by argument-dependent lookup @@ -128,6 +129,13 @@ 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 OpenSSL PRNG with current contents of the screen RAND_screen(); |