aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant
diff options
context:
space:
mode:
authorDeepthi Gowri <deepthi@codeaurora.org>2013-02-06 22:55:06 (GMT)
committerJouni Malinen <j@w1.fi>2013-02-08 09:54:01 (GMT)
commit45f4a97a3a3f7e064228e0e3b42a7eb6c667cba9 (patch)
tree7d86bab3c07b703baa083ad39d764b94a298de12 /wpa_supplicant
parent83e7aedf729aa7db8ab0dba7bab724564a33fcd2 (diff)
downloadhostap-45f4a97a3a3f7e064228e0e3b42a7eb6c667cba9.zip
hostap-45f4a97a3a3f7e064228e0e3b42a7eb6c667cba9.tar.gz
hostap-45f4a97a3a3f7e064228e0e3b42a7eb6c667cba9.tar.bz2
eap_proxy: Add mechanism for allowing EAP methods to be offloaded
In addition to the offload mechanism, the Android configuration and makefiles are extended to allow this to be configured for the build by dropping in platform specific configuration files and makefile without having to modify any existing files. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
Diffstat (limited to 'wpa_supplicant')
-rw-r--r--wpa_supplicant/Android.mk6
-rw-r--r--wpa_supplicant/Makefile7
-rw-r--r--wpa_supplicant/android.config2
3 files changed, 15 insertions, 0 deletions
diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index da9577d..d08b3f7 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -1473,6 +1473,12 @@ ifneq ($(BOARD_WPA_SUPPLICANT_PRIVATE_LIB),)
LOCAL_STATIC_LIBRARIES += $(BOARD_WPA_SUPPLICANT_PRIVATE_LIB)
endif
LOCAL_SHARED_LIBRARIES := libc libcutils
+
+ifdef CONFIG_EAP_PROXY
+OBJS += src/eap_peer/eap_proxy_$(CONFIG_EAP_PROXY).c
+include $(LOCAL_PATH)/eap_proxy_$(CONFIG_EAP_PROXY).mk
+endif
+
ifeq ($(CONFIG_TLS), openssl)
LOCAL_SHARED_LIBRARIES += libcrypto libssl
endif
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index f39a3d7..da2abfc 100644
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -482,6 +482,13 @@ CONFIG_EAP_SIM_COMMON=y
NEED_AES_CBC=y
endif
+ifdef CONFIG_EAP_PROXY
+CFLAGS += -DCONFIG_EAP_PROXY
+OBJS += ../src/eap_peer/eap_proxy_$(CONFIG_EAP_PROXY).o
+include eap_proxy_$(CONFIG_EAP_PROXY).mk
+CONFIG_IEEE8021X_EAPOL=y
+endif
+
ifdef CONFIG_EAP_AKA_PRIME
# EAP-AKA'
ifeq ($(CONFIG_EAP_AKA_PRIME), dyn)
diff --git a/wpa_supplicant/android.config b/wpa_supplicant/android.config
index 2655010..6eacd01 100644
--- a/wpa_supplicant/android.config
+++ b/wpa_supplicant/android.config
@@ -498,3 +498,5 @@ CONFIG_NO_ROAMING=y
# Enable P2P
CONFIG_P2P=y
CONFIG_AP=y
+
+include $(wildcard $(LOCAL_PATH)/android_config_*.inc)