Check for openssl/hmac.h

Apart from dealing with a FIXME, this is needed for implementing
compatibility fallbacks for some functions introduced in OpenSSL 1.1, in
following commits.

diff --git a/configure b/configure
index c9ab0b53b8377f3bc42f96191ea6943264b68e99..39d184f4d37ab9f6b47167f5019b5c34fbc47792 100755 (executable)
--- a/configure
+++ b/configure
@@ -8668,6 +8668,7 @@ $as_echo "#define HAVE_OPENSSL_SSL_H 1" >>confdefs.h
       openssl/crypto.h \
       openssl/err.h \
       openssl/evp.h \
+      openssl/hmac.h \
       openssl/md5.h \
       openssl/md4.h \
       openssl/sha.h \

diff --git a/configure.ac b/configure.ac
index bd9fc4580639bc1d9a33af028544f0955b027b8d..de7b88facb16e17e6691e19faae07ba91ff266d7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1107,6 +1107,7 @@ if test "x$WITH_OPENSSL" = xyes; then
       openssl/crypto.h \
       openssl/err.h \
       openssl/evp.h \
+      openssl/hmac.h \
       openssl/md5.h \
       openssl/md4.h \
       openssl/sha.h \

diff --git a/src/include/autoconf.h.in b/src/include/autoconf.h.in
index 7f528542531a43dce336f1e8cf6dca4cd8a40116..61f812840a248ec6f761f538f12557eb280a8069 100644 (file)
--- a/src/include/autoconf.h.in
+++ b/src/include/autoconf.h.in
@@ -260,6 +260,9 @@
 /* Define to 1 if you have the <openssl/evp.h> header file. */
 #undef HAVE_OPENSSL_EVP_H
 
+/* Define to 1 if you have the <openssl/hmac.h> header file. */
+#undef HAVE_OPENSSL_HMAC_H
+
 /* Define to 1 if you have the <openssl/md4.h> header file. */
 #undef HAVE_OPENSSL_MD4_H
 

diff --git a/src/modules/rlm_wimax/rlm_wimax.c b/src/modules/rlm_wimax/rlm_wimax.c
index 784ae635e9b3ee83e1985a1e8193b4e860155f0c..531dc0e4b74aba12f9621b8a5a792a7d279c8295 100644 (file)
--- a/src/modules/rlm_wimax/rlm_wimax.c
+++ b/src/modules/rlm_wimax/rlm_wimax.c
@@ -27,10 +27,9 @@ USES_APPLE_DEPRECATED_API    /* OpenSSL API has been deprecated by Apple */
 #include <freeradius-devel/radiusd.h>
 #include <freeradius-devel/modules.h>
 
-/*
- *     FIXME: Add check for this header to configure.ac
- */
+#ifdef HAVE_OPENSSL_HMAC_H
 #include <openssl/hmac.h>
+#endif
 
 /*
  *     FIXME: Fix the build system to create definitions from names.