Move iapp.c into src/ap

[libeap.git] / hostapd / Makefile

diff --git a/hostapd/Makefile b/hostapd/Makefile
index 6524ff0..113dcbc 100644 (file)
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -32,13 +32,24 @@ CFLAGS += -DCONFIG_NATIVE_WINDOWS
 LIBS += -lws2_32
 endif
 
-OBJS = hostapd.o main.o ieee802_1x.o \
-       config.o ieee802_11_auth.o \
-       sta_info.o wpa.o \
-       preauth.o pmksa_cache.o \
-       drv_callbacks.o \
-       tkip_countermeasures.o \
-       mlme.o wpa_auth_ie.o
+OBJS = hostapd.o
+OBJS += main.o
+OBJS += config_file.o
+OBJS += drv_callbacks.o
+OBJS += ap_drv_ops.o
+
+OBJS += ../src/ap/utils.o
+OBJS += ../src/ap/ieee802_1x.o
+OBJS += ../src/ap/config.o
+OBJS += ../src/ap/ieee802_11_auth.o
+OBJS += ../src/ap/sta_info.o
+OBJS += ../src/ap/wpa.o
+OBJS += ../src/ap/tkip_countermeasures.o
+OBJS += ../src/ap/mlme.o
+OBJS += ../src/ap/wpa_auth_ie.o
+OBJS += ../src/ap/preauth.o
+OBJS += ../src/ap/pmksa_cache.o
+
 NEED_RC4=y
 NEED_AES=y
 NEED_MD5=y
@@ -48,6 +59,18 @@ OBJS += ../src/drivers/drivers.o
 OBJS += ../src/drivers/scan_helpers.o
 CFLAGS += -DHOSTAPD
 
+ifdef CONFIG_WPA_TRACE
+CFLAGS += -DWPA_TRACE
+OBJS += ../src/utils/trace.o
+LDFLAGS += -rdynamic
+CFLAGS += -funwind-tables
+ifdef CONFIG_WPA_TRACE_BFD
+CFLAGS += -DWPA_TRACE_BFD
+LIBS += -lbfd
+LIBS_c += -lbfd
+endif
+endif
+
 OBJS += ../src/utils/eloop.o
 OBJS += ../src/utils/common.o
 OBJS += ../src/utils/wpa_debug.o
@@ -80,20 +103,20 @@ endif
 ifdef CONFIG_NO_ACCOUNTING
 CFLAGS += -DCONFIG_NO_ACCOUNTING
 else
-OBJS += accounting.o
+OBJS += ../src/ap/accounting.o
 endif
 
 ifdef CONFIG_NO_VLAN
 CFLAGS += -DCONFIG_NO_VLAN
 else
-OBJS += vlan_init.o
+OBJS += ../src/ap/vlan_init.o
 endif
 
 ifdef CONFIG_NO_CTRL_IFACE
 CFLAGS += -DCONFIG_NO_CTRL_IFACE
 else
 OBJS += ctrl_iface.o
-OBJS += ctrl_iface_ap.o
+OBJS += ../src/ap/ctrl_iface_ap.o
 endif
 
 OBJS += ../src/crypto/md5.o
@@ -102,7 +125,7 @@ CFLAGS += -DCONFIG_CTRL_IFACE -DCONFIG_CTRL_IFACE_UNIX
 
 ifdef CONFIG_IAPP
 CFLAGS += -DCONFIG_IAPP
-OBJS += iapp.o
+OBJS += ../src/ap/iapp.o
 endif
 
 ifdef CONFIG_RSN_PREAUTH
@@ -112,7 +135,7 @@ endif
 
 ifdef CONFIG_PEERKEY
 CFLAGS += -DCONFIG_PEERKEY
-OBJS += peerkey.o
+OBJS += ../src/ap/peerkey.o
 endif
 
 ifdef CONFIG_IEEE80211W
@@ -123,7 +146,7 @@ endif
 
 ifdef CONFIG_IEEE80211R
 CFLAGS += -DCONFIG_IEEE80211R
-OBJS += wpa_ft.o
+OBJS += ../src/ap/wpa_ft.o
 NEED_SHA256=y
 NEED_AES_OMAC1=y
 NEED_AES_UNWRAP=y
@@ -267,7 +290,7 @@ endif
 ifdef CONFIG_WPS
 CFLAGS += -DCONFIG_WPS -DEAP_SERVER_WSC
 OBJS += ../src/utils/uuid.o
-OBJS += wps_hostapd.o
+OBJS += ../src/ap/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
@@ -314,6 +337,7 @@ OBJS += ../src/wps/wps_upnp.o
 OBJS += ../src/wps/wps_upnp_ssdp.o
 OBJS += ../src/wps/wps_upnp_web.o
 OBJS += ../src/wps/wps_upnp_event.o
+OBJS += ../src/wps/wps_upnp_ap.o
 OBJS += ../src/wps/upnp_xml.o
 OBJS += ../src/wps/httpread.o
 OBJS += ../src/wps/http_client.o
@@ -329,6 +353,7 @@ OBJS += ../src/eap_common/eap_ikev2_common.o ../src/eap_common/ikev2_common.o
 NEED_DH_GROUPS=y
 NEED_DH_GROUPS_ALL=y
 NEED_MODEXP=y
+NEED_CIPHER=y
 endif
 
 ifdef CONFIG_EAP_TNC
@@ -342,10 +367,12 @@ endif
 endif
 
 # Basic EAP functionality is needed for EAPOL
+OBJS += eap_register.o
 OBJS += ../src/eap_server/eap.o
 OBJS += ../src/eap_common/eap_common.o
 OBJS += ../src/eap_server/eap_methods.o
 OBJS += ../src/eap_server/eap_identity.o
+CFLAGS += -DEAP_SERVER_IDENTITY
 
 ifdef CONFIG_EAP
 CFLAGS += -DEAP_SERVER
@@ -443,6 +470,7 @@ ifndef CONFIG_CRYPTO
 CONFIG_CRYPTO=internal
 endif
 ifdef TLS_FUNCS
+OBJS += ../src/crypto/crypto_internal-rsa.o
 OBJS += ../src/crypto/tls_internal.o
 OBJS += ../src/tls/tlsv1_common.o
 OBJS += ../src/tls/tlsv1_record.o
@@ -456,17 +484,23 @@ OBJS += ../src/tls/x509v3.o
 OBJS += ../src/tls/pkcs1.o
 OBJS += ../src/tls/pkcs5.o
 OBJS += ../src/tls/pkcs8.o
+NEED_SHA256=y
 NEED_BASE64=y
 NEED_TLS_PRF=y
 NEED_MODEXP=y
+NEED_CIPHER=y
 CFLAGS += -DCONFIG_TLS_INTERNAL
 CFLAGS += -DCONFIG_TLS_INTERNAL_SERVER
 endif
+ifdef NEED_CIPHER
+NEED_DES=y
+OBJS += ../src/crypto/crypto_internal-cipher.o
+endif
 ifdef NEED_MODEXP
+OBJS += ../src/crypto/crypto_internal-modexp.o
 OBJS += ../src/tls/bignum.o
 endif
 ifeq ($(CONFIG_CRYPTO), libtomcrypt)
-CFLAGS += -DCONFIG_INTERNAL_X509
 OBJS += ../src/crypto/crypto_libtomcrypt.o
 LIBS += -ltomcrypt -ltfm
 LIBS_h += -ltomcrypt -ltfm
@@ -475,7 +509,6 @@ CONFIG_INTERNAL_RC4=y
 CONFIG_INTERNAL_DH_GROUP5=y
 endif
 ifeq ($(CONFIG_CRYPTO), internal)
-CFLAGS += -DCONFIG_INTERNAL_X509
 OBJS += ../src/crypto/crypto_internal.o
 NEED_AES_DEC=y
 CFLAGS += -DCONFIG_CRYPTO_INTERNAL
@@ -530,10 +563,6 @@ CONFIG_INTERNAL_RC4=y
 endif
 endif
 
-ifdef NEED_MODEXP
-CFLAGS += -DCONFIG_MODEXP
-endif
-
 AESOBJS = # none so far
 ifdef CONFIG_INTERNAL_AES
 AESOBJS += ../src/crypto/aes-internal.o ../src/crypto/aes-internal-enc.o
@@ -622,19 +651,16 @@ OBJS += ../src/crypto/sha256-internal.o
 endif
 endif
 
-ifdef CONFIG_INTERNAL_DH_GROUP5
 ifdef NEED_DH_GROUPS
 OBJS += ../src/crypto/dh_groups.o
-OBJS += ../src/crypto/dh_group5.o
-ifdef NEED_DH_GROUPS_ALL
-CFLAGS += -DALL_DH_GROUPS
-endif
 endif
-else
 ifdef NEED_DH_GROUPS_ALL
-OBJS += ../src/crypto/dh_groups.o
 CFLAGS += -DALL_DH_GROUPS
 endif
+ifdef CONFIG_INTERNAL_DH_GROUP5
+ifdef NEED_DH_GROUPS
+OBJS += ../src/crypto/dh_group5.o
+endif
 endif
 
 ifdef CONFIG_RADIUS_SERVER
@@ -661,8 +687,14 @@ OBJS += ../src/utils/base64.o
 endif
 
 ifdef NEED_AP_MLME
-OBJS += beacon.o wme.o ap_list.o ieee802_11.o
+OBJS += ../src/ap/beacon.o
+OBJS += ../src/ap/wmm.o
+OBJS += ../src/ap/ap_list.o
+OBJS += ../src/ap/ieee802_11.o
 OBJS += hw_features.o
+ifdef CONFIG_IEEE80211N
+OBJS += ../src/ap/ieee802_11_ht.o
+endif
 CFLAGS += -DNEED_AP_MLME
 endif
 
@@ -709,8 +741,12 @@ hostapd: $(BCHECK) $(OBJS)
        $(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
 
 OBJS_c = hostapd_cli.o ../src/common/wpa_ctrl.o ../src/utils/os_$(CONFIG_OS).o
+ifdef CONFIG_WPA_TRACE
+OBJS_c += ../src/utils/trace.o
+OBJS_c += ../src/utils/wpa_debug.o
+endif
 hostapd_cli: $(OBJS_c)
-       $(CC) $(LDFLAGS) -o hostapd_cli $(OBJS_c)
+       $(CC) $(LDFLAGS) -o hostapd_cli $(OBJS_c) $(LIBS_c)
 
 NOBJS = nt_password_hash.o ../src/crypto/ms_funcs.o $(SHA1OBJS) ../src/crypto/rc4.o ../src/crypto/md5.o
 ifdef CONFIG_INTERNAL_MD5
@@ -721,7 +757,7 @@ ifdef TLS_FUNCS
 LIBS_n += -lcrypto
 endif
 
-HOBJS += ../src/hlr_auc_gw/hlr_auc_gw.o ../src/utils/common.o ../src/utils/wpa_debug.o ../src/utils/os_$(CONFIG_OS).o ../src/utils/wpabuf.o ../src/hlr_auc_gw/milenage.o
+HOBJS += hlr_auc_gw.o ../src/utils/common.o ../src/utils/wpa_debug.o ../src/utils/os_$(CONFIG_OS).o ../src/utils/wpabuf.o ../src/crypto/milenage.o
 HOBJS += ../src/crypto/aes-encblock.o
 ifdef CONFIG_INTERNAL_AES
 HOBJS += ../src/crypto/aes-internal.o
@@ -739,21 +775,4 @@ clean:
        rm -f core *~ *.o hostapd hostapd_cli nt_password_hash hlr_auc_gw
        rm -f *.d
 
-TEST_SRC_MILENAGE = ../src/hlr_auc_gw/milenage.c ../src/crypto/aes-internal.c ../src/crypto/aes-internal-dec.c \
-               ../src/crypto/aes-cbc.c \
-               ../src/crypto/aes-ctr.c \
-               ../src/crypto/aes-eax.c \
-               ../src/crypto/aes-encblock.c \
-               ../src/crypto/aes-internal-enc.c \
-               ../src/crypto/aes-omac1.c \
-               ../src/crypto/aes-unwrap.c \
-               ../src/crypto/aes-wrap.c \
-                ../src/utils/common.c ../src/utils/wpa_debug.o ../src/utils/os_$(CONFIG_OS).c
-test-milenage: $(TEST_SRC_MILENAGE)
-       $(CC) $(LDFLAGS) -o test-milenage -Wall -Werror $(TEST_SRC_MILENAGE) \
-               -DTEST_MAIN_MILENAGE -I. \
-               -I../src/crypto -I../src/utils
-       ./test-milenage
-       rm test-milenage
-
 -include $(OBJS:%.o=%.d)