Require openssl >= 1.1.1

Versions older this are sufficiently old that we don't want to support
them, and they require extra support code.
This commit is contained in:
Robert Hensing 2023-02-03 18:07:47 +01:00
parent 2196fd1146
commit 2445afd92c
4 changed files with 1 additions and 27 deletions

View file

@ -184,7 +184,7 @@ fi
# Look for OpenSSL, a required dependency. FIXME: this is only (maybe) # Look for OpenSSL, a required dependency. FIXME: this is only (maybe)
# used by S3BinaryCacheStore. # used by S3BinaryCacheStore.
PKG_CHECK_MODULES([OPENSSL], [libcrypto], [CXXFLAGS="$OPENSSL_CFLAGS $CXXFLAGS"]) PKG_CHECK_MODULES([OPENSSL], [libcrypto >= 1.1.1], [CXXFLAGS="$OPENSSL_CFLAGS $CXXFLAGS"])
# Look for libarchive. # Look for libarchive.

View file

@ -17,29 +17,6 @@
namespace nix { 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) { static size_t regularHashSize(HashType type) {
switch (type) { switch (type) {
case htMD5: return md5HashSize; case htMD5: return md5HashSize;

View file

@ -48,7 +48,6 @@ extern char * * environ __attribute__((weak));
namespace nix { namespace nix {
void initLibUtil() { void initLibUtil() {
initOpenSSL();
} }
std::optional<std::string> getEnv(const std::string & key) std::optional<std::string> getEnv(const std::string & key)

View file

@ -34,8 +34,6 @@ struct Source;
void initLibUtil(); void initLibUtil();
void initOpenSSL();
/** /**
* The system for which Nix is compiled. * The system for which Nix is compiled.
*/ */