LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

No need to use OpenSSL malloc/free

Browse source
This commit is contained in:
Thomas Snider 2017-03-22 15:34:33 -07:00
parent 02d64bd929
commit 6d5dd60c88
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/util.cpp
View file

@ -117,26 +117,24 @@ std::atomic<bool> fReopenDebugLog(false);
CTranslationInterface translationInterface; CTranslationInterface translationInterface;
/** Init OpenSSL library multithreading support */ /** Init OpenSSL library multithreading support */
static CCriticalSection** ppmutexOpenSSL; static std::unique_ptr<CCriticalSection[]> ppmutexOpenSSL;
void locking_callback(int mode, int i, const char* file, int line) NO_THREAD_SAFETY_ANALYSIS void locking_callback(int mode, int i, const char* file, int line) NO_THREAD_SAFETY_ANALYSIS
{ {
if (mode & CRYPTO_LOCK) { if (mode & CRYPTO_LOCK) {
ENTER_CRITICAL_SECTION(*ppmutexOpenSSL[i]); ENTER_CRITICAL_SECTION(ppmutexOpenSSL[i]);
} else { } else {
LEAVE_CRITICAL_SECTION(*ppmutexOpenSSL[i]); LEAVE_CRITICAL_SECTION(ppmutexOpenSSL[i]);
} }
} }
// Init // Singleton for wrapping OpenSSL setup/teardown.
class CInit class CInit
{ {
public: public:
CInit() CInit()
{ {
// Init OpenSSL library multithreading support // Init OpenSSL library multithreading support
ppmutexOpenSSL = (CCriticalSection**)OPENSSL_malloc(CRYPTO_num_locks() * sizeof(CCriticalSection*)); ppmutexOpenSSL.reset(new CCriticalSection[CRYPTO_num_locks()]);
for (int i = 0; i < CRYPTO_num_locks(); i++)
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. // OpenSSL can optionally load a config file which lists optional loadable modules and engines.
@ -160,9 +158,8 @@ public:
RAND_cleanup(); RAND_cleanup();
// Shutdown OpenSSL library multithreading support // Shutdown OpenSSL library multithreading support
CRYPTO_set_locking_callback(NULL); CRYPTO_set_locking_callback(NULL);
for (int i = 0; i < CRYPTO_num_locks(); i++) // Clear the set of locks now to maintain symmetry with the constructor.
delete ppmutexOpenSSL[i]; ppmutexOpenSSL.reset();
OPENSSL_free(ppmutexOpenSSL);
} }
} }
instance_of_cinit; instance_of_cinit;