aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libutil/hash.cc23
-rw-r--r--src/libutil/util.cc1
-rw-r--r--src/libutil/util.hh2
3 files changed, 0 insertions, 26 deletions
diff --git a/src/libutil/hash.cc b/src/libutil/hash.cc
index 9df8bcfb4..02bddc8d9 100644
--- a/src/libutil/hash.cc
+++ b/src/libutil/hash.cc
@@ -17,29 +17,6 @@
namespace nix {
-#if OPENSSL_VERSION_NUMBER < 0x10101000L
-/* 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();
-}
-#endif
-
-void initOpenSSL() {
-#if OPENSSL_VERSION_NUMBER < 0x10101000L
- /* Initialise OpenSSL locking. */
- opensslLocks = std::vector<std::mutex>(CRYPTO_num_locks());
- CRYPTO_set_locking_callback(opensslLockCallback);
-#endif
-}
-
static size_t regularHashSize(HashType type) {
switch (type) {
case htMD5: return md5HashSize;
diff --git a/src/libutil/util.cc b/src/libutil/util.cc
index 5c19dc737..21d1c8dcd 100644
--- a/src/libutil/util.cc
+++ b/src/libutil/util.cc
@@ -48,7 +48,6 @@ extern char * * environ __attribute__((weak));
namespace nix {
void initLibUtil() {
- initOpenSSL();
}
std::optional<std::string> getEnv(const std::string & key)
diff --git a/src/libutil/util.hh b/src/libutil/util.hh
index 08993e1cf..6ff9d2524 100644
--- a/src/libutil/util.hh
+++ b/src/libutil/util.hh
@@ -34,8 +34,6 @@ struct Source;
void initLibUtil();
-void initOpenSSL();
-
/**
* The system for which Nix is compiled.
*/