From: Jouni Malinen <j@w1.fi>
Date: Sat, 1 Mar 2025 18:44:06 +0000 (+0200)
Subject: EAP-pwd: Do not include MS_FUNCS in CONFIG_FIPS=y builds
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=373378f892151cc7d27b386098d6afb195fb76a6;p=thirdparty%2Fhostap.git

EAP-pwd: Do not include MS_FUNCS in CONFIG_FIPS=y builds

MS_FUNCS needs MD4 and that is not available with CONFIG_FIPS=y.

Signed-off-by: Jouni Malinen <j@w1.fi>
---

diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 82388bc6e..cb07e7364 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -773,8 +773,10 @@ OBJS += src/eap_peer/eap_pwd.c src/eap_common/eap_pwd_common.c
 CONFIG_IEEE8021X_EAPOL=y
 NEED_ECC=y
 NEED_DRAGONFLY=y
+ifndef CONFIG_FIPS
 MS_FUNCS=y
 endif
+endif
 
 ifdef CONFIG_EAP_EKE
 # EAP-EKE
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index bf9875e6d..fd7d7a0bd 100644
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -828,8 +828,10 @@ OBJS += ../src/eap_peer/eap_pwd.o ../src/eap_common/eap_pwd_common.o
 CONFIG_IEEE8021X_EAPOL=y
 NEED_ECC=y
 NEED_DRAGONFLY=y
+ifndef CONFIG_FIPS
 MS_FUNCS=y
 endif
+endif
 
 ifdef CONFIG_EAP_EKE
 # EAP-EKE