diff options
| author | Hans Nilsson <[email protected]> | 2019-03-18 11:39:40 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2019-03-18 11:39:40 +0100 |
| commit | 63820aafb93f82584fb4528e6c9d05952ffd31e2 (patch) | |
| tree | fd431f0e50b0d918ead6c606af18b28e6249418c /lib/crypto/c_src | |
| parent | 2d661f8272addcec37b0a8205d614cb398df530b (diff) | |
| parent | 98e5f741c8305b9549b236c4f2583343cc422d7e (diff) | |
| download | otp-63820aafb93f82584fb4528e6c9d05952ffd31e2.tar.gz otp-63820aafb93f82584fb4528e6c9d05952ffd31e2.tar.bz2 otp-63820aafb93f82584fb4528e6c9d05952ffd31e2.zip | |
Merge branch 'hans/crypto/fix_chacha20_bug/OTP-15678'
* hans/crypto/fix_chacha20_bug/OTP-15678:
crypto: Disable chacha20 if OpenSSL 1.1.0-1.1.0c
Diffstat (limited to 'lib/crypto/c_src')
| -rw-r--r-- | lib/crypto/c_src/openssl_config.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/crypto/c_src/openssl_config.h b/lib/crypto/c_src/openssl_config.h index 45144a0c25..1c138e3bd1 100644 --- a/lib/crypto/c_src/openssl_config.h +++ b/lib/crypto/c_src/openssl_config.h @@ -203,12 +203,17 @@ #if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,1,0) # ifndef HAS_LIBRESSL -# define HAVE_CHACHA20 # define HAVE_CHACHA20_POLY1305 # define HAVE_RSA_OAEP_MD # endif #endif +#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(1,1,0,'d') +# ifndef HAS_LIBRESSL +# define HAVE_CHACHA20 +# endif +#endif + // OPENSSL_VERSION_NUMBER >= 1.1.1-pre8 #if OPENSSL_VERSION_NUMBER >= (PACKED_OPENSSL_VERSION_PLAIN(1,1,1)-7) # ifndef HAS_LIBRESSL |