diff options
| author | Hans Nilsson <[email protected]> | 2018-09-18 10:12:02 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-09-18 10:12:02 +0200 |
| commit | a578ee7615e72a8eb0ad0e35ae94437b41db96ee (patch) | |
| tree | 7713467635fc181968ebb62b017c36d80be6e9da /lib/crypto | |
| parent | ecf6e712f2721fe27431f0093d176c4c2e9bde71 (diff) | |
| parent | e23384bdb5653f3c304beafb3042fabe9f599e25 (diff) | |
| download | otp-a578ee7615e72a8eb0ad0e35ae94437b41db96ee.tar.gz otp-a578ee7615e72a8eb0ad0e35ae94437b41db96ee.tar.bz2 otp-a578ee7615e72a8eb0ad0e35ae94437b41db96ee.zip | |
Merge branch 'hans/crypto/disable_rsa_sslv23_libressl/OTP-15303' into maint
* hans/crypto/disable_rsa_sslv23_libressl/OTP-15303:
crypto: Disable problematic RSA options in LibreSSL
Diffstat (limited to 'lib/crypto')
| -rw-r--r-- | lib/crypto/c_src/crypto.c | 6 |
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) |