aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2008-12-20 10:39:24 (GMT)
committerJouni Malinen <j@w1.fi>2008-12-20 10:39:24 (GMT)
commita2b3a34babedabf15be3e87902fe612c602b6b7c (patch)
tree82bac5ef461932a34c5b300962eeb5e0e0dfcd7a
parentad5302a1cac57b28cba1147c7fc90807e0959c48 (diff)
downloadhostap-a2b3a34babedabf15be3e87902fe612c602b6b7c.zip
hostap-a2b3a34babedabf15be3e87902fe612c602b6b7c.tar.gz
hostap-a2b3a34babedabf15be3e87902fe612c602b6b7c.tar.bz2
IANA allocated EAP method type 51 to EAP-GPSK
-rw-r--r--hostapd/ChangeLog1
-rw-r--r--src/eap_common/eap_defs.h5
-rw-r--r--wpa_supplicant/ChangeLog1
3 files changed, 4 insertions, 3 deletions
diff --git a/hostapd/ChangeLog b/hostapd/ChangeLog
index 7ffe9c6..c097873 100644
--- a/hostapd/ChangeLog
+++ b/hostapd/ChangeLog
@@ -17,6 +17,7 @@ ChangeLog for hostapd
mac80211
* added support for EAP-AKA' (draft-arkko-eap-aka-kdf)
* added support for using driver_test over UDP socket
+ * changed EAP-GPSK to use the IANA assigned EAP method type 51
2008-11-23 - v0.6.6
* added a new configuration option, wpa_ptk_rekey, that can be used to
diff --git a/src/eap_common/eap_defs.h b/src/eap_common/eap_defs.h
index 44bfd26..0ac95b5 100644
--- a/src/eap_common/eap_defs.h
+++ b/src/eap_common/eap_defs.h
@@ -67,9 +67,8 @@ typedef enum {
EAP_TYPE_SAKE = 48 /* RFC 4763 */,
EAP_TYPE_IKEV2 = 49 /* RFC 5106 */,
EAP_TYPE_AKA_PRIME = 50 /* draft-arkko-eap-aka-kdf-10.txt */,
- EAP_TYPE_EXPANDED = 254 /* RFC 3748 */,
- EAP_TYPE_GPSK = 255 /* EXPERIMENTAL - type not yet allocated
- * draft-ietf-emu-eap-gpsk-01.txt */
+ EAP_TYPE_GPSK = 51 /* draft-ietf-emu-eap-gpsk-17.txt */,
+ EAP_TYPE_EXPANDED = 254 /* RFC 3748 */
} EapType;
diff --git a/wpa_supplicant/ChangeLog b/wpa_supplicant/ChangeLog
index d320c7c..899bdfd 100644
--- a/wpa_supplicant/ChangeLog
+++ b/wpa_supplicant/ChangeLog
@@ -15,6 +15,7 @@ ChangeLog for wpa_supplicant
* fixed PEAPv0 Cryptobinding interoperability issue with Windows Server
2008 NPS; optional cryptobinding is now enabled (again) by default
* fixed PSK editing in wpa_gui
+ * changed EAP-GPSK to use the IANA assigned EAP method type 51
2008-11-23 - v0.6.6
* added Milenage SIM/USIM emulator for EAP-SIM/EAP-AKA