From: Nikolai Kondrashov <Nikolai.Kondrashov@redhat.com>
Date: Fri, 18 Nov 2016 18:08:43 +0000 (+0200)
Subject: Check for openssl/hmac.h
X-Git-Tag: release_3_0_13~92^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2cafe245e38728ac79771f902a10115202fcf80;p=thirdparty%2Ffreeradius-server.git

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 c9ab0b53b83..39d184f4d37 100755
--- 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 bd9fc458063..de7b88facb1 100644
--- 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 7f528542531..61f812840a2 100644
--- 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 784ae635e9b..531dc0e4b74 100644
--- 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.