aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-09-18 10:12:10 +0200
committerHans Nilsson <[email protected]>2018-09-18 10:12:10 +0200
commit09d3cb6cc120e57c4b506edfebb86532100ba754 (patch)
tree0efcd93dc9fccee5acc53a2f1e22229f7cbed9de /lib
parent2336ca0e15c93ae475a384457185085808b70c63 (diff)
parenta578ee7615e72a8eb0ad0e35ae94437b41db96ee (diff)
downloadotp-09d3cb6cc120e57c4b506edfebb86532100ba754.tar.gz
otp-09d3cb6cc120e57c4b506edfebb86532100ba754.tar.bz2
otp-09d3cb6cc120e57c4b506edfebb86532100ba754.zip
Merge branch 'maint'
* maint: crypto: Disable problematic RSA options in LibreSSL
Diffstat (limited to 'lib')
-rw-r--r--lib/crypto/c_src/crypto.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index 07ef60e395..3172059414 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -213,8 +213,10 @@
# define HAVE_ECB_IVEC_BUG
#endif
-#ifdef RSA_SSLV23_PADDING
-# define HAVE_RSA_SSLV23_PADDING
+#ifndef HAS_LIBRESSL
+# ifdef RSA_SSLV23_PADDING
+# define HAVE_RSA_SSLV23_PADDING
+# endif
#endif
#if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION_PLAIN(1,0,0)