hostapd: Fix internal crypto build without TLS

[wpasupplicant] / wpa_supplicant / Makefile

diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index b50b661..1f23643 100644 (file)
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -138,6 +138,8 @@ LIBS += -lnl
 ifdef CONFIG_CLIENT_MLME
 OBJS_d += ../src/utils/radiotap.o
 endif
+NEED_SME=y
+NEED_AP_MLME=y
 endif
 
 ifdef CONFIG_DRIVER_PRISM54
@@ -461,6 +463,7 @@ OBJS += ../src/eap_common/eap_fast_common.o
 OBJS_h += ../src/eap_server/eap_fast.o
 endif
 TLS_FUNCS=y
+CONFIG_IEEE8021X_EAPOL=y
 NEED_T_PRF=y
 endif
 
@@ -534,6 +537,21 @@ OBJS += ../src/wps/wps_ufd.o
 NEED_WPS_OOB=y
 endif
 
+ifdef CONFIG_WPS_NFC
+CFLAGS += -DCONFIG_WPS_NFC
+OBJS += ../src/wps/ndef.o
+OBJS += ../src/wps/wps_nfc.o
+NEED_WPS_OOB=y
+ifdef CONFIG_WPS_NFC_PN531
+PN531_PATH ?= /usr/local/src/nfc
+CFLAGS += -DCONFIG_WPS_NFC_PN531
+CFLAGS += -I${PN531_PATH}/inc
+OBJS += ../src/wps/wps_nfc_pn531.o
+LIBS += ${PN531_PATH}/lib/wpsnfc.dll
+LIBS += ${PN531_PATH}/lib/libnfc_mapping_pn53x.dll
+endif
+endif
+
 ifdef NEED_WPS_OOB
 CFLAGS += -DCONFIG_WPS_OOB
 endif
@@ -587,9 +605,11 @@ OBJS_h += ../src/eap_server/eap_tnc.o
 OBJS_h += ../src/eap_server/tncs.o
 NEED_BASE64=y
 ifndef CONFIG_NATIVE_WINDOWS
+ifndef CONFIG_DRIVER_BSD
 LIBS += -ldl
 endif
 endif
+endif
 
 ifdef CONFIG_IEEE8021X_EAPOL
 # IEEE 802.1X/EAPOL state machines (e.g., for RADIUS authentication)
@@ -601,6 +621,52 @@ LIBS += -ldl -rdynamic
 endif
 endif
 
+ifdef CONFIG_AP
+CFLAGS += -DCONFIG_AP
+OBJS += ap.o
+CFLAGS += -DCONFIG_NO_RADIUS
+CFLAGS += -DCONFIG_NO_ACCOUNTING
+CFLAGS += -DCONFIG_NO_VLAN
+OBJS += ../hostapd/hostapd.o
+OBJS += ../hostapd/config.o
+OBJS += ../src/utils/ip_addr.o
+OBJS += ../hostapd/sta_info.o
+OBJS += ../hostapd/wpa.o
+OBJS += ../hostapd/pmksa_cache.o
+OBJS += ../hostapd/wpa_auth_ie.o
+OBJS += ../hostapd/tkip_countermeasures.o
+OBJS += ../hostapd/mlme.o
+OBJS += ../hostapd/ieee802_1x.o
+OBJS += ../hostapd/eapol_sm.o
+OBJS += ../hostapd/ieee802_11_auth.o
+OBJS += ../hostapd/drv_callbacks.o
+ifdef CONFIG_IEEE80211R
+OBJS += ../hostapd/wpa_ft.o
+endif
+ifdef CONFIG_PEERKEY
+OBJS += ../hostapd/peerkey.o
+endif
+
+CFLAGS += -DEAP_SERVER
+OBJS += ../src/eap_server/eap.o
+OBJS += ../src/eap_server/eap_identity.o
+OBJS += ../src/eap_server/eap_methods.o
+
+ifdef NEED_AP_MLME
+OBJS += ../hostapd/beacon.o
+OBJS += ../hostapd/wme.o
+OBJS += ../hostapd/ap_list.o
+OBJS += ../hostapd/ieee802_11.o
+OBJS += ../hostapd/hw_features.o
+CFLAGS += -DNEED_MLME
+endif
+ifdef CONFIG_WPS
+CFLAGS += -DEAP_SERVER_WSC
+OBJS += ../hostapd/wps_hostapd.o
+OBJS += ../src/eap_server/eap_wsc.o
+endif
+endif
+
 ifdef CONFIG_EAP_SERVER
 CFLAGS += -DEAP_SERVER
 OBJS_h += ../src/eap_server/eap.o
@@ -950,6 +1016,7 @@ endif
 ifdef CONFIG_IEEE80211R
 CFLAGS += -DCONFIG_IEEE80211R
 OBJS += ../src/rsn_supp/wpa_ft.o
+NEED_80211_COMMON=y
 endif
 
 ifndef CONFIG_NO_WPA
@@ -1019,9 +1086,19 @@ ifdef NEED_BASE64
 OBJS += ../src/utils/base64.o
 endif
 
+ifdef NEED_SME
+OBJS += sme.o
+CFLAGS += -DCONFIG_SME
+endif
+
 ifdef CONFIG_CLIENT_MLME
-OBJS += mlme.o ../src/common/ieee802_11_common.o
+OBJS += mlme.o
 CFLAGS += -DCONFIG_CLIENT_MLME
+NEED_80211_COMMON=y
+endif
+
+ifdef NEED_80211_COMMON
+OBJS += ../src/common/ieee802_11_common.o
 endif
 
 ifndef CONFIG_MAIN