From Nick Lowe:

Improve names for the EAP types, add missing definition. 

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7020

svn path=/trunk/; revision=42092

1 files changed, 57 insertions, 57 deletions

diff --git a/epan/dissectors/packet-eap.c b/epan/dissectors/packet-eap.c
index 4d1470b700..ddb59418f8 100644
--- a/epan/dissectors/packet-eap.c
+++ b/epan/dissectors/packet-eap.c
@@ -110,66 +110,66 @@ References:
   3) RFC2284
   4) RFC3748
   5) http://www.iana.org/assignments/eap-numbers EAP registry (updated 2011-02-22)
+  6) http://tools.ietf.org/html/draft-bersani-eap-synthesis-sharedkeymethods-00
 */
 
 const value_string eap_type_vals[] = {
-  {  1,          "Identity [RFC3748]" },
-  {  2,          "Notification [RFC3748]" },
-  {  3,          "Legacy Nak (Response only) [RFC3748]" },
-  {  4,          "MD5-Challenge [RFC3748]" },
-  {  5,          "One Time Password (OTP) [RFC3748]" },
-  {  6,          "Generic Token Card [RFC3748]" },
-  {  7,          "Allocated" },
-  {  8,          "Allocated" },
-  {  9,          "RSA Public Key Authentication [Whelan]" },
-  { 10,          "DSS Unilateral [Nace]" },
-  { 11,          "KEA [Nace]" },
-  { 12,          "KEA-VALIDATE [Nace]" },
-  { 13,          "EAP-TLS [RFC5216] [Aboba]" },
-  { 14,          "Defender Token (AXENT) [Rosselli]" },
-  { 15,          "RSA Security SecurID EAP [Nystrom]" },
-  { 16,          "Arcot Systems EAP [Jerdonek]" },
-  { 17,          "EAP-Cisco Wireless (LEAP) [Norman]" },
-  { 18,          "GSM Subscriber Identity Modules (EAP-SIM) [RFC4186]" },
-  { 19,          "SRP-SHA1 Part 1 [Carlson]" },
-  { 20,          "Unassigned" },
-  { 21,          "EAP-TTLS [RFC5281]" },
-  { 22,          "Remote Access Service [Fields]" },
-  { 23,          "EAP-AKA Authentication [RFC4187]" },
-  { 24,          "EAP-3Com Wireless [Young]" },
-  { 25,          "PEAP [Palekar]" },
-  { 26,          "MS-EAP-Authentication [Palekar]" },
-  { 27,          "Mutual Authentication w/Key Exchange (MAKE)[Berrendonner]" },
-  { 28,          "CRYPTOCard [Webb]" },
-  { 29,          "EAP-MSCHAP-V2 [Potter]" },
-  { 30,          "DynamID [Merlin]" },
-  { 31,          "Rob EAP [Ullah]" },
-  { 32,          "Protected One-Time Password [RFC4793] [Nystrom]" },
-  { 33,          "MS-Authentication-TLV [Palekar]" },
-  { 34,          "SentriNET [Kelleher]" },
-  { 35,          "EAP-Actiontec Wireless [Chang]" },
-  { 36,          "Cogent Systems Biometrics Authentication EAP [Xiong]" },
-  { 37,          "AirFortress EAP [Hibbard]" },
-  { 38,          "EAP-HTTP Digest [Tavakoli]" },
-  { 39,          "SecureSuite EAP [Clements]" },
-  { 40,          "DeviceConnect EAP [Pitard]" },
-  { 41,          "EAP-SPEKE [Zick]" },
-  { 42,          "EAP-MOBAC [Rixom]" },
-  { 43,          "EAP-FAST [RFC4851]" },
-  { 44,          "ZoneLabs EAP (ZLXEAP) [Bogue]" },
-  { 45,          "EAP-Link [Zick]" },
-  { 46,          "EAP-PAX [Clancy]" },
-  { 47,          "EAP-PSK [RFC4764]" },
-  { 48,          "EAP-SAKE [RFC4763]" },
-  { 49,          "EAP-IKEv2 [RFC5106]" },
-  { 50,          "EAP-AKA' [RFC5448]" },
-  { 51,          "EAP-GPSK [RFC5433]" },
-  { 52,          "EAP-pwd [RFC5931]" },
-  { 53,          "EAP-EKE Version 1 [RFC6124]" },
-  { 254,         "Expanded Type [RFC3748]" },
-  { 255,         "Experimental [RFC3748]" },
-  { 0,           NULL }
-
+    { 1,           "Identity" },
+    { 2,           "Notification" },
+    { 3,           "Legacy Nak (Response Only)" },
+    { 4,           "MD5-Challenge EAP (EAP-MD5-CHALLENGE)" },
+    { 5,           "One-Time Password EAP (EAP-OTP)" },
+    { 6,           "Generic Token Card EAP (EAP-GTC)" },
+    { 7,           "Allocated" },
+    { 8,           "Allocated" },
+    { 9,           "RSA Public Key Authentication EAP (EAP-RSA-PKA)" },
+    { 10,          "DSS Unilateral EAP (EAP-DSS)" },
+    { 11,          "KEA EAP (EAP-KEA)" },
+    { 12,          "KEA Validate EAP (EAP-KEA-VALIDATE)" },
+    { 13,          "TLS EAP (EAP-TLS)" },
+    { 14,          "Defender Token EAP (EAP-AXENT)" },
+    { 15,          "RSA Security SecurID EAP (EAP-RSA-SECURID)" },
+    { 16,          "Arcot Systems EAP (EAP-ARCOT-SYSTEMS)" },
+    { 17,          "Cisco Wireless EAP / Lightweight EAP (EAP-LEAP)" },
+    { 18,          "GSM Subscriber Identity Modules EAP (EAP-SIM)" },
+    { 19,          "Secure Remote Password SHA1 Part 1 EAP (EAP-SRP-SHA1-PART1)" },
+    { 20,          "Secure Remote Password SHA1 Part 2 EAP (EAP-SRP-SHA1-PART2)" },
+    { 21,          "Tunneled TLS EAP (EAP-TTLS)" },
+    { 22,          "Remote Access Service EAP (EAP-RAS)" },
+    { 23,          "UMTS Authentication and Key Agreement EAP (EAP-AKA)" },
+    { 24,          "3Com Wireless EAP (EAP-3COM)" },
+    { 25,          "Protected EAP (EAP-PEAP)" },
+    { 26,          "MS-Authentication EAP (EAP-MS-AUTH)" },
+    { 27,          "Mutual Authentication w/Key Exchange EAP (EAP-MAKE)" },
+    { 28,          "CRYPTOCard EAP (EAP-CRYPTOCARD)" },
+    { 29,          "MS-CHAP-v2 EAP (EAP-MS-CHAP-V2)" },
+    { 30,          "DynamID (EAP-DYNAMID)" },
+    { 31,          "Rob EAP (EAP-ROB)" },
+    { 32,          "Protected One-Time Password EAP (EAP-POTP)" },
+    { 33,          "MS-Authentication TLV EAP (EAP-MS-AUTH-TLV)" },
+    { 34,          "SentriNET (EAP-SENTRINET)" },
+    { 35,          "Actiontec Wireless EAP (EAP-ACTIONTEC-WIRELESS)" },
+    { 36,          "Cogent Systems Biometrics Authentication EAP (EAP-COGENT-BIOMETRIC)" },
+    { 37,          "AirFortress EAP (EAP-AIRFORTRESS)" },
+    { 38,          "HTTP Digest EAP (EAP-HTTP-DIGEST)" },
+    { 39,          "SecureSuite EAP (EAP-SECURESUITE)" },
+    { 40,          "DeviceConnect EAP (EAP-DEVICECONNECT)" },
+    { 41,          "Simple Password Exponential Key Exchange EAP (EAP-SPEKE)" },
+    { 42,          "MOBAC EAP (EAP-MOBAC)" },
+    { 43,          "Flexible Authentication via Secure Tunneling EAP (EAP-FAST)" },
+    { 44,          "ZoneLabs EAP (EAP-ZLXEAP)" },
+    { 45,          "Link EAP (EAP-LINK)" },
+    { 46,          "Password Authenticated eXchange EAP (EAP-PAX)" },
+    { 47,          "Pre-Shared Key EAP (EAP-PSK)" },
+    { 48,          "Shared-secret Authentication and Key Establishment EAP (EAP-SAKE)" },
+    { 49,          "Internet Key Exchange v2 EAP (EAP-IKEv2)" },
+    { 50,          "UMTS Authentication and Key Agreement' EAP (EAP-AKA')" },
+    { 51,          "Generalized Pre-Shared Key EAP (EAP-GPSK)" },
+    { 52,          "Password EAP (EAP-pwd)" },
+    { 53,          "Encrypted Key Exchange v1 EAP (EAP-EKEv1)" },
+    { 254,         "Expanded Type" },
+    { 255,         "Experimental" },
+    { 0,           NULL }
 };
 
 const value_string eap_sim_subtype_vals[] = {