From shivesh83@gmail.com:

Enhancement to dissect EAP/AKA'
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4426
I also updated some PPP and EAP numbers.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31704 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/packet-eap.c b/epan/dissectors/packet-eap.c
index 5c16f0e4658d85f0ad95eb3108357b0891f6052a..ff8ba5ee3bd235d4c990ac1557ccb038afdc5fd5 100644 (file)
--- a/epan/dissectors/packet-eap.c
+++ b/epan/dissectors/packet-eap.c
@@ -55,6 +55,8 @@ const value_string eap_code_vals[] = {
     { EAP_RESPONSE, "Response" },
     { EAP_SUCCESS,  "Success" },
     { EAP_FAILURE,  "Failure" },
+    { EAP_INITIATE, "Initiate" }, /* [RFC5296] */
+    { EAP_FINISH,   "Finish" },   /* [RFC5296] */
     { 0,            NULL }
 };
 
@@ -118,8 +120,9 @@ const value_string eap_type_vals[] = {
   { 47,          "EAP-PSK [RFC4764]" },
   { 48,          "EAP-SAKE [RFC4763]" },
   { 49,          "EAP-IKEv2 [RFC5106]" },
-  { 50,          "EAP-AKA' [RFC-arkko-eap-aka-kdf-10.txt]" },
+  { 50,          "EAP-AKA' [RFC5448]" },
   { 51,          "EAP-GPSK [RFC5433]" },
+  { 53,          "EAP-pwd [RFC-harkins-emu-eap-pwd-12.txt]" },
   { 254,         "Expanded Type [RFC3748]" },
   { 255,         "Experimental [RFC3748]" },
   { 0,          NULL }
@@ -544,6 +547,8 @@ dissect_eap_aka(proto_tree *eap_tree, tvbuff_t *tvb, int offset, gint size)
                { 20, "AT_COUNTER_TOO_SMALL" },
                { 21, "AT_NONCE_S" },
                { 22, "AT_CLIENT_ERROR_CODE" },
+               { 23,  "AT_KDF_INPUT"},
+               { 24,  "AT_KDF"},
                { 129, "AT_IV" },
                { 130, "AT_ENCR_DATA" },
                { 132, "AT_NEXT_PSEUDONYM" },
@@ -1160,6 +1165,7 @@ dissect_eap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
               EAP-AKA - draft-arkko-pppext-eap-aka-12.txt
       **********************************************************************/
       case EAP_TYPE_AKA:
+         case EAP_TYPE_AKA_PRIME:
        if (tree)
          dissect_eap_aka(eap_tree, tvb, offset, size);
        break; /* EAP_TYPE_AKA */

diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c
index 948372466b51fc7dc048a272ae63ba8dac68ebe1..7887030f5a647135129239632c7ceaa3cf9db5a2 100644 (file)
--- a/epan/dissectors/packet-ppp.c
+++ b/epan/dissectors/packet-ppp.c
@@ -258,31 +258,32 @@ const value_string ppp_vals[] = {
        {PPP_ROHC_LCID, "ROHC large-CID" },
        {PPP_IP,        "IP"             },
        {PPP_OSI,       "OSI"            },
-       {PPP_DEC4,      "DECnet Phase IV" },
+       {PPP_DEC4,      "DECnet Phase IV" },
        {PPP_AT,        "Appletalk"      },
        {PPP_IPX,       "Netware IPX/SPX"},
        {PPP_VJC_COMP,  "VJ compressed TCP"},
        {PPP_VJC_UNCOMP,"VJ uncompressed TCP"},
        {PPP_BCP,       "Bridging Control Protocol"},
-       {PPP_ST,        "Stream Protocol (ST-II)" },
+       {PPP_ST,        "Stream Protocol (ST-II)" },
        {PPP_VINES,     "Vines"          },
        {PPP_AT_EDDP,   "AppleTalk EDDP" },
-       {PPP_AT_SB,     "AppleTalk SmartBuffered" },
-       {PPP_MP,        "Multilink"},
-       {PPP_NB,        "NETBIOS Framing" },
-       {PPP_CISCO,     "Cisco Systems" },
-       {PPP_ASCOM,     "Ascom Timeplex" },
-       {PPP_LBLB,      "Fujitsu Link Backup and Load Balancing" },
-       {PPP_RL,        "DCA Remote Lan" },
-       {PPP_SDTP,      "Serial Data Transport Protocol" },
-       {PPP_LLC,       "SNA over LLC" },
-       {PPP_SNA,       "SNA" },
+       {PPP_AT_SB,         "AppleTalk SmartBuffered" },
+       {PPP_MP,            "Multilink"},
+       {PPP_NB,            "NETBIOS Framing" },
+       {PPP_CISCO,         "Cisco Systems" },
+       {PPP_ASCOM,         "Ascom Timeplex" },
+       {PPP_LBLB,          "Fujitsu Link Backup and Load Balancing" },
+       {PPP_RL,            "DCA Remote Lan" },
+       {PPP_SDTP,          "Serial Data Transport Protocol" },
+       {PPP_LLC,           "SNA over LLC" },
+       {PPP_SNA,           "SNA" },
        {PPP_IPV6HC,    "IPv6 Header Compression " },
-       {PPP_KNX,       "KNX Bridging Data" },
+       {PPP_KNX,           "KNX Bridging Data" },
        {PPP_ENCRYPT,   "Encryption" },
-       {PPP_ILE,       "Individual Link Encryption" },
+       {PPP_ILE,           "Individual Link Encryption" },
        {PPP_IPV6,      "IPv6"           },
-        {PPP_MUX,       "PPP Multiplexing"},
+    {PPP_MUX,       "PPP Multiplexing"},
+    {PPP_VSNP,      "Vendor-Specific Network Protocol"},
        {PPP_RTP_FH,    "RTP IPHC Full Header" },
        {PPP_RTP_CTCP,  "RTP IPHC Compressed TCP" },
        {PPP_RTP_CNTCP, "RTP IPHC Compressed Non TCP" },
@@ -292,88 +293,91 @@ const value_string ppp_vals[] = {
        {PPP_MPPLUS,    "MP+ Protocol" },
        {PPP_NTCITS_IPI,"NTCITS IPI" },
        {PPP_ML_SLCOMP, "single link compression in multilink" },
-       {PPP_COMP,      "compressed packet" },
+       {PPP_COMP,          "compressed packet" },
        {PPP_STP_HELLO, "802.1D Hello Packet" },
        {PPP_IBM_SR,    "IBM Source Routing BPDU" },
        {PPP_DEC_LB,    "DEC LANBridge100 Spanning Tree"},
        {PPP_CDP,       "Cisco Discovery Protocol" },
-       {PPP_NETCS,     "Netcs Twin Routing" },
+       {PPP_NETCS,     "Netcs Twin Routing" },
        {PPP_STP,       "Scheduled Transfer Protocol" },
        {PPP_EDP,       "Extreme Discovery Protocol" },
-       {PPP_OSCP,      "Optical Supervisory Channel Protocol" },
-       {PPP_OSCP2,     "Optical Supervisory Channel Protocol" },
+       {PPP_OSCP,          "Optical Supervisory Channel Protocol" },
+       {PPP_OSCP2,         "Optical Supervisory Channel Protocol" },
        {PPP_LUXCOM,    "Luxcom" },
-       {PPP_SIGMA,     "Sigma Network Systems" },
-       {PPP_ACSP,      "Apple Client Server Protocol" },
+       {PPP_SIGMA,     "Sigma Network Systems" },
+       {PPP_ACSP,      "Apple Client Server Protocol" },
        {PPP_MPLS_UNI,  "MPLS Unicast"},
        {PPP_MPLS_MULTI, "MPLS Multicast"},
        {PPP_P12844,    "IEEE p1284.4 standard - data packets" },
-       {PPP_ETSI,      "ETSI TETRA Networks Protocol Type 1" },
-       {PPP_MFTP,      "Multichannel Flow Treatment Protocol" },
+       {PPP_ETSI,      "ETSI TETRA Networks Protocol Type 1" },
+       {PPP_MFTP,      "Multichannel Flow Treatment Protocol" },
        {PPP_RTP_CTCPND,"RTP IPHC Compressed TCP No Delta" },
        {PPP_RTP_CS,    "RTP IPHC Context State" },
        {PPP_RTP_CUDP16,"RTP IPHC Compressed UDP 16" },
        {PPP_RTP_CRDP16,"RTP IPHC Compressed RTP 16" },
-       {PPP_CCCP,      "Cray Communications Control Protocol" },
+       {PPP_CCCP,              "Cray Communications Control Protocol" },
        {PPP_CDPD_MNRP, "CDPD Mobile Network Registration Protocol" },
        {PPP_EXPANDAP,  "Expand accelerator protocol" },
        {PPP_ODSICP,    "ODSICP NCP" },
        {PPP_DOCSIS,    "DOCSIS DLL" },
-       {PPP_LZS,       "Stacker LZS" },
+       {PPP_LZS,               "Stacker LZS" },
        {PPP_REFTEK,    "RefTek Protocol" },
-       {PPP_FC,        "Fibre Channel" },
-       {PPP_EMIT,      "EMIT Protocols" },
-       {PPP_IPCP,      "IP Control Protocol" },
+       {PPP_FC,                "Fibre Channel" },
+       {PPP_EMIT,              "EMIT Protocols" },
+       {PPP_VSP,               "Vendor-Specific Protocol" },
+       {PPP_IPCP,              "IP Control Protocol" },
        {PPP_OSICP,     "OSI Control Protocol" },
        {PPP_XNSIDPCP,  "Xerox NS IDP Control Protocol" },
        {PPP_DECNETCP,  "DECnet Phase IV Control Protocol" },
-       {PPP_ATCP,      "AppleTalk Control Protocol" },
-       {PPP_IPXCP,     "IPX Control Protocol" },
+       {PPP_ATCP,              "AppleTalk Control Protocol" },
+       {PPP_IPXCP,             "IPX Control Protocol" },
        {PPP_BRIDGENCP, "Bridging NCP" },
-       {PPP_SPCP,      "Stream Protocol Control Protocol" },
-       {PPP_BVCP,      "Banyan Vines Control Protocol" },
-       {PPP_MLCP,      "Multi-Link Control Protocol" },
-       {PPP_NBCP,      "NETBIOS Framing Control Protocol" },
+       {PPP_SPCP,              "Stream Protocol Control Protocol" },
+       {PPP_BVCP,              "Banyan Vines Control Protocol" },
+       {PPP_MLCP,              "Multi-Link Control Protocol" },
+       {PPP_NBCP,              "NETBIOS Framing Control Protocol" },
        {PPP_CISCOCP,   "Cisco Systems Control Protocol" },
        {PPP_ASCOMCP,   "Ascom Timeplex" },
        {PPP_LBLBCP,    "Fujitsu LBLB Control Protocol" },
-       {PPP_RLNCP,     "DCA Remote Lan Network Control Protocol" },
-       {PPP_SDCP,      "Serial Data Control Protocol" },
-       {PPP_LLCCP,     "SNA over LLC Control Protocol" },
-       {PPP_SNACP,     "SNA Control Protocol" },
-       {PPP_KNXCP,     "KNX Bridging Control Protocol" },
-       {PPP_ECP,       "Encryption Control Protocol" },
-       {PPP_ILECP,     "Individual Encryption Control Protocol" },
+       {PPP_RLNCP,             "DCA Remote Lan Network Control Protocol" },
+       {PPP_SDCP,              "Serial Data Control Protocol" },
+       {PPP_LLCCP,             "SNA over LLC Control Protocol" },
+       {PPP_SNACP,             "SNA Control Protocol" },
+       {PPP_KNXCP,             "KNX Bridging Control Protocol" },
+       {PPP_ECP,               "Encryption Control Protocol" },
+       {PPP_ILECP,             "Individual Encryption Control Protocol" },
        {PPP_IPV6CP,    "IPv6 Control Protocol" },
        {PPP_MUXCP,     "PPPMux Control Protocol"},
+       {PPP_VSNCP,     "Vendor-Specific Network Control Protocol"},
        {PPP_STAMPEDECP,"Stampede Bridging Control Protocol" },
-       {PPP_MPPCP,     "MP+ Control Protocol" },
-       {PPP_IPICP,     "NTCITS IPI Control Protocol" },
-       {PPP_SLCC,      "single link compression in multilink control" },
-       {PPP_CCP,       "Compression Control Protocol" },
-       {PPP_CDPCP,     "CDP Control Protocol" },
+       {PPP_MPPCP,             "MP+ Control Protocol" },
+       {PPP_IPICP,             "NTCITS IPI Control Protocol" },
+       {PPP_SLCC,              "single link compression in multilink control" },
+       {PPP_CCP,               "Compression Control Protocol" },
+       {PPP_CDPCP,             "CDP Control Protocol" },
        {PPP_NETCSCP,   "Netcs Twin Routing" },
-       {PPP_STPCP,     "STP - Control Protocol" },
-       {PPP_EDPCP,     "EDP Control Protocol" },
-       {PPP_ACSPC,     "Apple Client Server Protocol Control" },
+       {PPP_STPCP,             "STP - Control Protocol" },
+       {PPP_EDPCP,     "EDP Control Protocol" },
+       {PPP_ACSPC,     "Apple Client Server Protocol Control" },
        {PPP_MPLSCP,    "MPLS Control Protocol" },
        {PPP_P12844CP,  "IEEE p1284.4 standard - Protocol Control" },
        {PPP_ETSICP,    "ETSI TETRA TNP1 Control Protocol" },
        {PPP_MFTPCP,    "Multichannel Flow Treatment Protocol" },
-       {PPP_LCP,       "Link Control Protocol" },
-       {PPP_PAP,       "Password Authentication Protocol"  },
-       {PPP_LQR,       "Link Quality Report protocol" },
-       {PPP_SPAP,      "Shiva Password Authentication Protocol" },
-       {PPP_CBCP,      "Callback Control Protocol" },
-       {PPP_BACP,      "Bandwidth Allocation Control Protocol" },
-       {PPP_BAP,       "Bandwidth Allocation Protocol" },
+       {PPP_LCP,               "Link Control Protocol" },
+       {PPP_PAP,               "Password Authentication Protocol"  },
+       {PPP_LQR,               "Link Quality Report protocol" },
+       {PPP_SPAP,              "Shiva Password Authentication Protocol" },
+       {PPP_CBCP,              "Callback Control Protocol" },
+       {PPP_BACP,              "Bandwidth Allocation Control Protocol" },
+       {PPP_BAP,               "Bandwidth Allocation Protocol" },
+       {PPP_VSAP,              "Vendor-Specific Authentication Protocol" },
        {PPP_CONTCP,    "Container Control Protocol" },
-       {PPP_CHAP,      "Challenge Handshake Authentication Protocol" },
-       {PPP_RSAAP,     "RSA Authentication Protocol" },
-       {PPP_EAP,       "Extensible Authentication Protocol" },
-       {PPP_SIEP,      "Mitsubishi Security Information Exchange Protocol"},
-       {PPP_SBAP,      "Stampede Bridging Authorization Protocol" },
-       {PPP_PRPAP,     "Proprietary Authentication Protocol" },
+       {PPP_CHAP,              "Challenge Handshake Authentication Protocol" },
+       {PPP_RSAAP,             "RSA Authentication Protocol" },
+       {PPP_EAP,               "Extensible Authentication Protocol" },
+       {PPP_SIEP,              "Mitsubishi Security Information Exchange Protocol"},
+       {PPP_SBAP,              "Stampede Bridging Authorization Protocol" },
+       {PPP_PRPAP,             "Proprietary Authentication Protocol" },
        {PPP_PRPAP2,    "Proprietary Authentication Protocol" },
        {PPP_PRPNIAP,   "Proprietary Node ID Authentication Protocol" },
        {0,             NULL            }

diff --git a/epan/eap.h b/epan/eap.h
index d455a6d303c9e3f6b895852b39f79b9e5d1c0a32..722e226a6750dac2f4ceca732551a1ac2b738537 100644 (file)
--- a/epan/eap.h
+++ b/epan/eap.h
@@ -26,10 +26,14 @@
 #ifndef __EAP_H__
 #define __EAP_H__
 
+/* http://www.iana.org/assignments/eap-numbers */
 #define EAP_REQUEST     1
 #define EAP_RESPONSE    2
 #define EAP_SUCCESS     3
 #define EAP_FAILURE     4
+#define EAP_INITIATE    5 /* [RFC5296] */
+#define EAP_FINISH      6 /* [RFC5296] */
+
 
 WS_VAR_IMPORT const value_string eap_code_vals[];
 
@@ -45,6 +49,7 @@ WS_VAR_IMPORT const value_string eap_code_vals[];
 #define EAP_TYPE_PEAP  25
 #define EAP_TYPE_MSCHAPV2 26
 #define EAP_TYPE_FAST  43
+#define EAP_TYPE_AKA_PRIME     50
 #define EAP_TYPE_EXT  254
 
 WS_VAR_IMPORT const value_string eap_type_vals[];

diff --git a/epan/ppptypes.h b/epan/ppptypes.h
index 7d6078e3ffce54092fd585370510a5f7cdd59277..e382f1e783fb67d1f2d4acbb7f944eddc28fbc76 100644 (file)
--- a/epan/ppptypes.h
+++ b/epan/ppptypes.h
@@ -61,18 +61,19 @@
 #define PPP_ILE                0x55    /* Individual Link Encryption */
 #define PPP_IPV6       0x57    /* Internet Protocol Version 6 */
 #define PPP_MUX                0x59    /* PPP Multiplexing */
-#define PPP_RTP_FH     0x61    /* RTP IPHC Full Header */
+#define PPP_VSNP               0x5b    /* Vendor-Specific Network Protocol  */
+#define PPP_RTP_FH             0x61    /* RTP IPHC Full Header */
 #define PPP_RTP_CTCP   0x63    /* RTP IPHC Compressed TCP */
 #define PPP_RTP_CNTCP  0x65    /* RTP IPHC Compressed Non TCP */
 #define PPP_RTP_CUDP8  0x67    /* RTP IPHC Compressed UDP 8 */
 #define PPP_RTP_CRTP8  0x69    /* RTP IPHC Compressed RTP 8 */
 #define PPP_STAMPEDE   0x6f    /* Stampede Bridging */
-#define PPP_MPPLUS     0x73    /* MP+ Protocol */
+#define PPP_MPPLUS             0x73    /* MP+ Protocol */
 #define PPP_NTCITS_IPI 0xc1    /* NTCITS IPI */
 #define PPP_ML_SLCOMP  0xfb    /* single link compression in multilink */
-#define PPP_COMP       0xfd    /* compressed packet */
+#define PPP_COMP               0xfd    /* compressed packet */
 #define PPP_STP_HELLO  0x0201  /* 802.1d Hello Packet */
-#define PPP_IBM_SR     0x0203  /* IBM Source Routing BPDU */
+#define PPP_IBM_SR             0x0203  /* IBM Source Routing BPDU */
 #define PPP_DEC_LB     0x0205  /* DEC LANBridge100 Spanning Tree */
 #define PPP_CDP         0x0207  /* Cisco Discovery Protocol */
 #define PPP_NETCS      0x0209  /* Netcs Twin Routing */
@@ -101,6 +102,7 @@
 #define PPP_REFTEK     0x4023  /* RefTek Protocol */
 #define PPP_FC         0x4025  /* Fibre Channel */
 #define PPP_EMIT       0x4027  /* EMIT Protocols */
+#define PPP_VSP                0x405b  /* Vendor-Specific Protocol */
 #define PPP_IPCP       0x8021  /* IP Control Protocol */
 #define PPP_OSICP      0x8023  /* OSI Control Protocol */
 #define PPP_XNSIDPCP   0x8025  /* Xerox NS IDP Control Protocol */
@@ -124,6 +126,7 @@
 #define PPP_ILECP      0x8055  /* Individual Encryption Control Protocol */
 #define PPP_IPV6CP     0x8057  /* IPv6 Control Protocol */
 #define PPP_MUXCP       0x8059  /* PPPMux Control Protocol */
+#define PPP_VSNCP              0x805b  /* Vendor-Specific Network Control Protocol (VSNCP)   [RFC3772] */
 #define PPP_STAMPEDECP 0x806f  /* Stampede Bridging Control Protocol */
 #define PPP_MPPCP      0x8073  /* MP+ Contorol Protocol */
 #define PPP_IPICP      0x80c1  /* NTCITS IPI Control Protocol */
@@ -137,7 +140,7 @@
 #define PPP_MPLSCP     0x8281  /* MPLS Control Protocol */
 #define PPP_P12844CP   0x8285  /* IEEE p1284.4 standard - Protocol Control */
 #define PPP_ETSICP     0x8287  /* ETSI TETRA TNP1 Control Protocol */
-#define PPP_MFTPCP     0x8287  /* Multichannel Flow Treatment Protocol */
+#define PPP_MFTPCP     0x8289  /* Multichannel Flow Treatment Protocol */
 #define PPP_LCP                0xc021  /* Link Control Protocol */
 #define PPP_PAP                0xc023  /* Password Authentication Protocol */
 #define PPP_LQR                0xc025  /* Link Quality Report protocol */
@@ -145,6 +148,7 @@
 #define PPP_CBCP       0xc029  /* CallBack Control Protocol */
 #define PPP_BACP       0xc02b  /* Bandwidth Allocation Control Protocol */
 #define PPP_BAP                0xc02d  /* Bandwidth Allocation Protocol */
+#define PPP_VSAP       0xc05b  /* Vendor-Specific Authentication Protocol (VSAP) */
 #define PPP_CONTCP     0xc081  /* Container Control Protocol */
 #define PPP_CHAP       0xc223  /* Cryptographic Handshake Auth. Protocol */
 #define PPP_RSAAP      0xc225  /* RSA Authentication Protocol */