aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant
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 /wpa_supplicant
parent01b05694372c718f88d921785f8f1133e9992c36 (diff)
downloadhostap-06-a9d1364c5fd29a4afe2b45443c6e539ee6cc1e4e.zip
hostap-06-a9d1364c5fd29a4afe2b45443c6e539ee6cc1e4e.tar.gz
hostap-06-a9d1364c5fd29a4afe2b45443c6e539ee6cc1e4e.tar.bz2
Merged EAP-AKA' into eap_aka.c and added it to defconfig/ChangeLog
Diffstat (limited to 'wpa_supplicant')
-rw-r--r--wpa_supplicant/ChangeLog2
-rw-r--r--wpa_supplicant/Makefile5
-rw-r--r--wpa_supplicant/defconfig4
-rw-r--r--wpa_supplicant/eap_testing.txt1
4 files changed, 7 insertions, 5 deletions
diff --git a/wpa_supplicant/ChangeLog b/wpa_supplicant/ChangeLog
index 0c5ee9a..34dc8e4 100644
--- a/wpa_supplicant/ChangeLog
+++ b/wpa_supplicant/ChangeLog
@@ -10,6 +10,8 @@ ChangeLog for wpa_supplicant
wpa_supplicant.conf (see WPS section in the example configuration
file); new wpa_cli commands wps_pin, wps_pbc, and wps_reg are used to
manage WPS negotiation; see README-WPS for more details
+ * added support for EAP-AKA' (draft-arkko-eap-aka-kdf)
+
2008-11-23 - v0.6.6
* added Milenage SIM/USIM emulator for EAP-SIM/EAP-AKA
(can be used to simulate test SIM/USIM card with a known private key;
diff --git a/wpa_supplicant/Makefile b/wpa_supplicant/Makefile
index ff069a8..02b28f6 100644
--- a/wpa_supplicant/Makefile
+++ b/wpa_supplicant/Makefile
@@ -431,14 +431,9 @@ ifdef CONFIG_EAP_AKA_PRIME
# EAP-AKA'
ifeq ($(CONFIG_EAP_AKA_PRIME), dyn)
CFLAGS += -DEAP_AKA_PRIME_DYNAMIC
-EAPDYN += ../src/eap_peer/eap_aka_prime.so
else
CFLAGS += -DEAP_AKA_PRIME
-OBJS += ../src/eap_peer/eap_aka_prime.o
-OBJS_h += ../src/eap_server/eap_aka_prime.o
endif
-CONFIG_IEEE8021X_EAPOL=y
-CONFIG_EAP_SIM_COMMON=y
endif
ifdef CONFIG_EAP_SIM_COMMON
diff --git a/wpa_supplicant/defconfig b/wpa_supplicant/defconfig
index e62b9b3..a623736 100644
--- a/wpa_supplicant/defconfig
+++ b/wpa_supplicant/defconfig
@@ -156,6 +156,10 @@ CONFIG_EAP_LEAP=y
# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used)
#CONFIG_EAP_AKA=y
+# EAP-AKA' (enable CONFIG_PCSC, if EAP-AKA' is used).
+# This requires CONFIG_EAP_AKA to be enabled, too.
+#CONFIG_EAP_AKA_PRIME=y
+
# Enable USIM simulator (Milenage) for EAP-AKA
#CONFIG_USIM_SIMULATOR=y
diff --git a/wpa_supplicant/eap_testing.txt b/wpa_supplicant/eap_testing.txt
index cbf1c4e..34c9fb8 100644
--- a/wpa_supplicant/eap_testing.txt
+++ b/wpa_supplicant/eap_testing.txt
@@ -94,6 +94,7 @@ EAP-TTLS/EAP-GPSK - - - - - - - - - - + -
EAP-TTLS + TNC - - - - - + - - - - + -
EAP-SIM + - - ? - + - ? - - + -
EAP-AKA - - - - - + - - - - + -
+EAP-AKA' - - - - - - - - - - + -
EAP-PSK +7 - - - - + - - - - + -
EAP-PAX - - - - - + - - - - + -
EAP-SAKE - - - - - - - - - - + -