Merged EAP-AKA' into eap_aka.c and added it to defconfig/ChangeLog

[mech_eap.git] / hostapd / Makefile

diff --git a/hostapd/Makefile b/hostapd/Makefile
index 2580a44..5061413 100644 (file)
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -42,8 +42,8 @@ OBJS =        hostapd.o ieee802_1x.o eapol_sm.o \
        ieee802_11.o config.o ieee802_11_auth.o accounting.o \
        sta_info.o wpa.o ctrl_iface.o \
        drivers.o preauth.o pmksa_cache.o beacon.o \
-       hw_features.o wme.o ap_list.o reconfig.o \
-       mlme.o vlan_init.o ieee802_11h.o wpa_auth_ie.o
+       hw_features.o wme.o ap_list.o \
+       mlme.o vlan_init.o wpa_auth_ie.o
 
 OBJS += ../src/utils/eloop.o
 OBJS += ../src/utils/common.o
@@ -52,6 +52,7 @@ OBJS += ../src/utils/wpabuf.o
 OBJS += ../src/utils/os_$(CONFIG_OS).o
 OBJS += ../src/utils/ip_addr.o
 
+OBJS += ../src/common/ieee802_11_common.o
 OBJS += ../src/common/wpa_common.o
 
 OBJS += ../src/radius/radius.o
@@ -156,6 +157,8 @@ endif
 else
 OBJS += ../src/l2_packet/l2_packet_linux.o
 endif
+else
+OBJS += ../src/l2_packet/l2_packet_none.o
 endif
 
 
@@ -209,6 +212,10 @@ OBJS += ../src/eap_server/eap_aka.o
 CONFIG_EAP_SIM_COMMON=y
 endif
 
+ifdef CONFIG_EAP_AKA_PRIME
+CFLAGS += -DEAP_AKA_PRIME
+endif
+
 ifdef CONFIG_EAP_SIM_COMMON
 OBJS += ../src/eap_common/eap_sim_common.o
 # Example EAP-SIM/AKA interface for GSM/UMTS authentication. This can be
@@ -255,6 +262,24 @@ TLS_FUNCS=y
 NEED_T_PRF=y
 endif
 
+ifdef CONFIG_WPS
+CFLAGS += -DCONFIG_WPS -DEAP_WSC
+OBJS += ../src/utils/uuid.o
+OBJS += wps_hostapd.o
+OBJS += ../src/eap_server/eap_wsc.o ../src/eap_common/eap_wsc_common.o
+OBJS += ../src/wps/wps.o
+OBJS += ../src/wps/wps_common.o
+OBJS += ../src/wps/wps_attr_parse.o
+OBJS += ../src/wps/wps_attr_build.o
+OBJS += ../src/wps/wps_attr_process.o
+OBJS += ../src/wps/wps_dev_attr.o
+OBJS += ../src/wps/wps_enrollee.o
+OBJS += ../src/wps/wps_registrar.o
+NEED_DH_GROUPS=y
+NEED_SHA256=y
+NEED_CRYPTO=y
+endif
+
 ifdef CONFIG_EAP_IKEV2
 CFLAGS += -DEAP_IKEV2
 OBJS += ../src/eap_server/eap_ikev2.o ../src/eap_server/ikev2.o