|
@@ -789,7 +789,7 @@ then
|
|
|
else
|
|
|
CRYPTO_NAME="OpenSSL"
|
|
|
DISABLED_CRYPTO="Botan"
|
|
|
- CRYPTO_PACKAGE="openssl-1.0.0"
|
|
|
+ CRYPTO_PACKAGE="openssl-1.0.1"
|
|
|
AC_DEFINE_UNQUOTED([WITH_OPENSSL], [], [Compile with OpenSSL crypto])
|
|
|
AC_MSG_CHECKING(for OpenSSL library)
|
|
|
# from bind9
|
|
@@ -812,18 +812,10 @@ else
|
|
|
fi
|
|
|
AC_MSG_RESULT(yes)
|
|
|
if test "${use_openssl}" = "/usr" ; then
|
|
|
+ CRYPTO_CFLAGS=""
|
|
|
CRYPTO_INCLUDES=""
|
|
|
CRYPTO_LIBS="-lcrypto"
|
|
|
DISTCHECK_CRYPTO_CONFIGURE_FLAG="--with-openssl"
|
|
|
- case "$host" in
|
|
|
- *-apple-darwin*)
|
|
|
- # Starting with OSX 10.7 (Lion) OpenSSL is deprecated
|
|
|
- CRYPTO_CFLAGS="-Wno-deprecated-declarations"
|
|
|
- ;;
|
|
|
- *)
|
|
|
- CRYPTO_CFLAGS=""
|
|
|
- ;;
|
|
|
- esac
|
|
|
else
|
|
|
CRYPTO_CFLAGS=""
|
|
|
CRYPTO_INCLUDES="-I${use_openssl}/include"
|
|
@@ -848,6 +840,8 @@ else
|
|
|
esac
|
|
|
fi
|
|
|
dnl Determine the OpenSSL version
|
|
|
+ # Officially we support >= 1.0.1, 0.9.8 should fail the HMAC API,
|
|
|
+ # 1.0.0 could work but is not recommended.
|
|
|
AC_MSG_CHECKING([OpenSSL version])
|
|
|
cat > conftest.cpp << EOF
|
|
|
#include <openssl/opensslv.h>
|
|
@@ -889,7 +883,7 @@ EOF
|
|
|
n += HMAC_Final(&tmp, NULL, NULL);
|
|
|
])],
|
|
|
[AC_MSG_RESULT([yes])],
|
|
|
- [AC_MSG_ERROR([HMAC functions return void: the OpenSSL version should be too old, please change for >= 1.0.0])])
|
|
|
+ [AC_MSG_ERROR([HMAC functions return void: the OpenSSL version should be too old, please change for >= 1.0.1])])
|
|
|
LIBS=${LIBS_SAVED}
|
|
|
CPPFLAGS=${CPPFLAGS_SAVED}
|
|
|
fi
|