neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

openssl: avoid config file load/race

Browse Source 
Rebased-From: d4b1d5a8ba
Github-Pull: #6438
This commit is contained in:
Cory Fields 2015-07-14 17:38:03 -04:00 committed by Wladimir J. van der Laan
parent 3f5563877a
commit 7e66e9c97b
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/util.cpp
View File

@ -78,6 +78,7 @@
#include <boost/thread.hpp> #include <boost/thread.hpp>
#include <openssl/crypto.h> #include <openssl/crypto.h>
#include <openssl/rand.h> #include <openssl/rand.h>
#include <openssl/conf.h>
// Work around clang compilation problem in Boost 1.46: // 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 // /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(); ppmutexOpenSSL[i] = new CCriticalSection();
CRYPTO_set_locking_callback(locking_callback); 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 #ifdef WIN32
// Seed OpenSSL PRNG with current contents of the screen // Seed OpenSSL PRNG with current contents of the screen
RAND_screen(); RAND_screen();