Include HMAC-SHA384/512 KDF for SAE if SHA384/512 is included

It was possible to miss the HMAC functions if some other build
configuration parameters ended up setting NEED_SHA384/512=y.

Signed-off-by: Tomas Paukrt <tomaspaukrt@email.cz>

diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index 573564d5b0de904fda7120029aaebff045dc9535..e6c2fbf1837d1ca232597606943dc004fddeeef5 100644 (file)
--- a/hostapd/Android.mk
+++ b/hostapd/Android.mk
@@ -936,6 +936,17 @@ endif
 endif
 endif
 
+ifdef CONFIG_SAE
+ifdef NEED_SHA384
+# Need to add HMAC-SHA384 KDF as well, if SHA384 was enabled.
+NEED_HMAC_SHA384_KDF=y
+endif
+ifdef NEED_SHA512
+# Need to add HMAC-SHA512 KDF as well, if SHA512 was enabled.
+NEED_HMAC_SHA512_KDF=y
+endif
+endif
+
 L_CFLAGS += -DCONFIG_SHA256
 ifneq ($(CONFIG_TLS), openssl)
 ifneq ($(CONFIG_TLS), gnutls)

diff --git a/hostapd/Makefile b/hostapd/Makefile
index ca4439234a115c60331f19eda08f6316dee02cf1..fa0d366a85001eca55ffb9fc86ab1c04c3279f42 100644 (file)
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -1065,6 +1065,17 @@ endif
 endif
 endif
 
+ifdef CONFIG_SAE
+ifdef NEED_SHA384
+# Need to add HMAC-SHA384 KDF as well, if SHA384 was enabled.
+NEED_HMAC_SHA384_KDF=y
+endif
+ifdef NEED_SHA512
+# Need to add HMAC-SHA512 KDF as well, if SHA512 was enabled.
+NEED_HMAC_SHA512_KDF=y
+endif
+endif
+
 CFLAGS += -DCONFIG_SHA256
 ifneq ($(CONFIG_TLS), openssl)
 ifneq ($(CONFIG_TLS), linux)