aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2016-11-24 10:55:10 +0100
committerBjörn Gustavsson <[email protected]>2016-12-02 13:19:58 +0100
commit78a5de9611c25a4e7b5248aa9828f949f3a5c131 (patch)
treefc2288cb9f0a25490cb196f075e30ab18626141b /lib
parente30294f44d02200c20a80f1a3a2bb075afc3747d (diff)
downloadotp-78a5de9611c25a4e7b5248aa9828f949f3a5c131.tar.gz
otp-78a5de9611c25a4e7b5248aa9828f949f3a5c131.tar.bz2
otp-78a5de9611c25a4e7b5248aa9828f949f3a5c131.zip
crypto.c: Disable broken code for ChaCha and Poly1305
In June 2014, fb9d36c2c7c1 added support for the AES GCM ciphers (ChaCha/Poly1305) based on a development version of OpenSSL 1.1.0. The code is seriously broken when used with the released OpenSSL 1.1.0.
Diffstat (limited to 'lib')
-rw-r--r--lib/crypto/c_src/crypto.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index 86b839eddb..554aaf7587 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -138,6 +138,13 @@
#include <openssl/ecdsa.h>
#endif
+/*
+ * FIXME: The support for ChaCha and Poly1305 is based on pre-releases
+ * of OpenSSL 1.1.0. It is seriously broken when used with the released
+ * OpenSSL 1.1.0 or later.
+ */
+#undef HAVE_CHACHA20_POLY1305
+
#if defined(HAVE_CHACHA20_POLY1305)
#include <openssl/chacha.h>
#include <openssl/poly1305.h>