diff options
| author | Hans Nilsson <[email protected]> | 2019-02-11 11:35:56 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2019-02-11 11:35:56 +0100 |
| commit | 8f2e7b2c1082d34b59dfb534ce7e0c7993e2f9ee (patch) | |
| tree | 190ab98d91ca2039b9329069a0776c5a28d8bec0 /lib | |
| parent | ab5debc0869dbfa64e4afd4cd59404a56ce51d71 (diff) | |
| parent | 8b2fb7844b4f5828f974d2865474f07ad4870852 (diff) | |
| download | otp-8f2e7b2c1082d34b59dfb534ce7e0c7993e2f9ee.tar.gz otp-8f2e7b2c1082d34b59dfb534ce7e0c7993e2f9ee.tar.bz2 otp-8f2e7b2c1082d34b59dfb534ce7e0c7993e2f9ee.zip | |
Merge branch 'hans/crypto/disable_blake2_libressl/OTP-15564'
* hans/crypto/disable_blake2_libressl/OTP-15564:
crypto: Disable blake2 in LibreSSL (not supported)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/crypto/c_src/openssl_config.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/crypto/c_src/openssl_config.h b/lib/crypto/c_src/openssl_config.h index 16bc59a865..45144a0c25 100644 --- a/lib/crypto/c_src/openssl_config.h +++ b/lib/crypto/c_src/openssl_config.h @@ -160,6 +160,7 @@ // BLAKE2: #if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,1,1) \ + && !defined(HAS_LIBRESSL) \ && !defined(OPENSSL_NO_BLAKE2) # define HAVE_BLAKE2 #endif |