aboutsummaryrefslogtreecommitdiffstats
path: root/hostapd
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2008-12-07 17:24:56 (GMT)
committerJouni Malinen <j@w1.fi>2008-12-07 17:24:56 (GMT)
commita9d1364c5fd29a4afe2b45443c6e539ee6cc1e4e (patch)
treec7a0743c2fa2a1d0b4f82edd5eb696abc20a8342 /hostapd
parent01b05694372c718f88d921785f8f1133e9992c36 (diff)
downloadhostap-a9d1364c5fd29a4afe2b45443c6e539ee6cc1e4e.zip
hostap-a9d1364c5fd29a4afe2b45443c6e539ee6cc1e4e.tar.gz
hostap-a9d1364c5fd29a4afe2b45443c6e539ee6cc1e4e.tar.bz2
Merged EAP-AKA' into eap_aka.c and added it to defconfig/ChangeLog
Diffstat (limited to 'hostapd')
-rw-r--r--hostapd/ChangeLog1
-rw-r--r--hostapd/Makefile2
-rw-r--r--hostapd/defconfig4
3 files changed, 5 insertions, 2 deletions
diff --git a/hostapd/ChangeLog b/hostapd/ChangeLog
index 04b3100..586eb5e 100644
--- a/hostapd/ChangeLog
+++ b/hostapd/ChangeLog
@@ -15,6 +15,7 @@ ChangeLog for hostapd
information (added if ieee80211d=1 in configuration)
* fixed WEP authentication (both Open System and Shared Key) with
mac80211
+ * added support for EAP-AKA' (draft-arkko-eap-aka-kdf)
2008-11-23 - v0.6.6
* added a new configuration option, wpa_ptk_rekey, that can be used to
diff --git a/hostapd/Makefile b/hostapd/Makefile
index 19324d5..5061413 100644
--- a/hostapd/Makefile
+++ b/hostapd/Makefile
@@ -214,8 +214,6 @@ endif
ifdef CONFIG_EAP_AKA_PRIME
CFLAGS += -DEAP_AKA_PRIME
-OBJS += ../src/eap_server/eap_aka_prime.o
-CONFIG_EAP_SIM_COMMON=y
endif
ifdef CONFIG_EAP_SIM_COMMON
diff --git a/hostapd/defconfig b/hostapd/defconfig
index cbbd193..3daa6f9 100644
--- a/hostapd/defconfig
+++ b/hostapd/defconfig
@@ -80,6 +80,10 @@ CONFIG_EAP_TTLS=y
# EAP-AKA for the integrated EAP server
#CONFIG_EAP_AKA=y
+# EAP-AKA' for the integrated EAP server
+# This requires CONFIG_EAP_AKA to be enabled, too.
+#CONFIG_EAP_AKA_PRIME=y
+
# EAP-PAX for the integrated EAP server
#CONFIG_EAP_PAX=y