nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-25 16:23:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Remove obsolete OpenSSL locking code"

Browse Source 
This reverts commit aeb695c007.
This commit is contained in:
Eelco Dolstra 2019-09-04 14:06:52 +02:00
parent e302ba0e65
commit 4caeefaf00
No known key found for this signature in database
GPG Key ID: 8170B4726D7198DE
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/libmain/shared.cc
View File

@ -15,6 +15,8 @@
#include <unistd.h>
#include <signal.h>
#include <openssl/crypto.h>
namespace nix {
@ -78,6 +80,20 @@ string getArg(const string & opt,
}
/* OpenSSL is not thread-safe by default - it will randomly crash
unless the user supplies a mutex locking function. So let's do
that. */
static std::vector<std::mutex> opensslLocks;
static void opensslLockCallback(int mode, int type, const char * file, int line)
{
if (mode & CRYPTO_LOCK)
opensslLocks[type].lock();
else
opensslLocks[type].unlock();
}
static void sigHandler(int signo) { }
@ -89,6 +105,10 @@ void initNix()
std::cerr.rdbuf()->pubsetbuf(buf, sizeof(buf));
#endif
/* Initialise OpenSSL locking. */
opensslLocks = std::vector<std::mutex>(CRYPTO_num_locks());
CRYPTO_set_locking_callback(opensslLockCallback);
loadConfFile();
startSignalHandlerThread();

4
src/libutil/hash.cc
View File

@ -13,10 +13,6 @@
#include <sys/stat.h>
#include <fcntl.h>
#if OPENSSL_VERSION_NUMBER < 0x10101000L
#error "Unsupported version of OpenSSL, you need at least 1.1.1"
#endif
namespace nix {