diff options
| author | Björn Gustavsson <[email protected]> | 2016-12-09 10:12:09 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-12-09 10:13:57 +0100 |
| commit | 53aa4605b8c23ec1cb7d5a79625db00ebdd63423 (patch) | |
| tree | 44ad08ff6186a5b2a849ba1de3dea7936c060949 /erts | |
| parent | 25d76cf3def28eecfdb31bce42345c375c629600 (diff) | |
| parent | 458c012e18eda87803ef356221d68955f4b8012d (diff) | |
| download | otp-53aa4605b8c23ec1cb7d5a79625db00ebdd63423.tar.gz otp-53aa4605b8c23ec1cb7d5a79625db00ebdd63423.tar.bz2 otp-53aa4605b8c23ec1cb7d5a79625db00ebdd63423.zip | |
Merge branch 'bjorn/crypto/support-openssl-1.1'
* bjorn/crypto/support-openssl-1.1:
Support OpenSSL 1.1.0
crypto.c: Disable broken code for ChaCha and Poly1305
configure.in: Fix configure test for usable OpenSSL
configure.in: Fix test for SSL with Kerberos
OTP-13900
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/configure.in | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/erts/configure.in b/erts/configure.in index 98f3e6bcc5..2018e19b76 100644 --- a/erts/configure.in +++ b/erts/configure.in @@ -4285,8 +4285,7 @@ yes #include <stdio.h> #include <openssl/hmac.h>], [ - HMAC_CTX hc; - HMAC_CTX_init(&hc); + HMAC(0, 0, 0, 0, 0, 0, 0); ], [ssl_linkable=yes], [ssl_linkable=no]) @@ -4341,8 +4340,7 @@ dnl so it is - be adoptable #include <stdio.h> #include <openssl/hmac.h>], [ - HMAC_CTX hc; - HMAC_CTX_init(&hc); + HMAC(0, 0, 0, 0, 0, 0, 0); ], [ssl_dyn_linkable=yes], [ssl_dyn_linkable=no]) @@ -4447,12 +4445,14 @@ esac if test "x$SSL_APP" != "x" ; then dnl We found openssl, now check if we use kerberos 5 support + dnl FIXME: Do we still support platforms that have Kerberos? AC_MSG_CHECKING(for OpenSSL kerberos 5 support) old_CPPFLAGS=$CPPFLAGS CPPFLAGS=$SSL_INCLUDE AC_EGREP_CPP(^yes$,[ +#include <openssl/opensslv.h> #include <openssl/opensslconf.h> -#ifndef OPENSSL_NO_KRB5 +#if OPENSSL_VERSION_NUMBER < 0x1010000fL && !defined(OPENSSL_NO_KRB5) yes #endif ],[ @@ -4603,8 +4603,7 @@ yes) # Use standard lib locations for ssl runtime library path #include <openssl/hmac.h> ], [ - HMAC_CTX hc; - HMAC_CTX_init(&hc); + HMAC(0, 0, 0, 0, 0, 0, 0); ], [rpath_success=yes], [rpath_success=no]) |