diff options
author | Cory Fields <cory-nospam-@coryfields.com> | 2015-07-14 17:38:03 -0400 |
---|---|---|
committer | Cory Fields <cory-nospam-@coryfields.com> | 2015-07-14 17:54:04 -0400 |
commit | d4b1d5a8baf18e4c8d62846360c0c1c0c9331d70 (patch) | |
tree | 13aadf62baf12aa5bbf9c36143c28b4fcab6bd06 | |
parent | 3d9362d5ac1ec405955503dc67caf59e716df5e4 (diff) |
openssl: avoid config file load/race
-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 bb7df23205..00d0f3a00d 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -83,6 +83,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 @@ -134,6 +135,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(); |