*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifdef HAVE_CONFIG_H
static int hf_eap_md5_value_size = -1;
static int hf_eap_md5_value = -1;
+static int hf_eap_md5_extra_data = -1;
static int hf_eap_sim_subtype = -1;
+static int hf_eap_sim_reserved = -1;
static int hf_eap_sim_subtype_attribute = -1;
static int hf_eap_sim_subtype_type = -1;
static int hf_eap_sim_subtype_length = -1;
static int hf_eap_sim_subtype_value = -1;
static int hf_eap_aka_subtype = -1;
+static int hf_eap_aka_reserved = -1;
static int hf_eap_aka_subtype_attribute = -1;
static int hf_eap_aka_subtype_type = -1;
static int hf_eap_aka_subtype_length = -1;
static int hf_eap_aka_subtype_value = -1;
+static int hf_eap_leap_version = -1;
+static int hf_eap_leap_reserved = -1;
+static int hf_eap_leap_count = -1;
+static int hf_eap_leap_peer_challenge = -1;
+static int hf_eap_leap_peer_response = -1;
+static int hf_eap_leap_ap_challenge = -1;
+static int hf_eap_leap_ap_response = -1;
+static int hf_eap_leap_name = -1;
+
+static int hf_eap_ms_chap_v2_opcode = -1;
+static int hf_eap_ms_chap_v2_id = -1;
+static int hf_eap_ms_chap_v2_length = -1;
+static int hf_eap_ms_chap_v2_value_size = -1;
+static int hf_eap_ms_chap_v2_challenge = -1;
+static int hf_eap_ms_chap_v2_name = -1;
+static int hf_eap_ms_chap_v2_peer_challenge = -1;
+static int hf_eap_ms_chap_v2_reserved = -1;
+static int hf_eap_ms_chap_v2_nt_response = -1;
+static int hf_eap_ms_chap_v2_flags = -1;
+static int hf_eap_ms_chap_v2_message = -1;
+static int hf_eap_ms_chap_v2_failure_request = -1;
+
static gint ett_eap = -1;
static dissector_handle_t ssl_handle;
const value_string eap_code_vals[] = {
- { EAP_REQUEST, "Request" },
- { EAP_RESPONSE, "Response" },
- { EAP_SUCCESS, "Success" },
- { EAP_FAILURE, "Failure" },
- { EAP_INITIATE, "Initiate" }, /* [RFC5296] */
- { EAP_FINISH, "Finish" }, /* [RFC5296] */
- { 0, NULL }
+ { EAP_REQUEST, "Request" },
+ { EAP_RESPONSE, "Response" },
+ { EAP_SUCCESS, "Success" },
+ { EAP_FAILURE, "Failure" },
+ { EAP_INITIATE, "Initiate" }, /* [RFC5296] */
+ { EAP_FINISH, "Finish" }, /* [RFC5296] */
+ { 0, NULL }
};
/*
References:
- 1) http://www.iana.org/assignments/ppp-numbers
- PPP EAP REQUEST/RESPONSE TYPES
+ 1) http://www.iana.org/assignments/ppp-numbers PPP EAP REQUEST/RESPONSE TYPES
2) http://www.ietf.org/internet-drafts/draft-ietf-pppext-rfc2284bis-02.txt
3) RFC2284
4) RFC3748
- 5) http://www.iana.org/assignments/eap-numbers EAP registry (updated 2009-02-25)
+ 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]" },
- { 53, "EAP-pwd [RFC-harkins-emu-eap-pwd-12.txt]" },
- { 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-WIRELESS)" },
+ { 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 (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[] = {
- { SIM_START, "Start" },
- { SIM_CHALLENGE, "Challenge" },
- { SIM_NOTIFICATION, "Notification" },
- { SIM_RE_AUTHENTICATION, "Re-authentication" },
- { SIM_CLIENT_ERROR, "Client-Error" },
- { 0, NULL }
+ { SIM_START, "Start" },
+ { SIM_CHALLENGE, "Challenge" },
+ { SIM_NOTIFICATION, "Notification" },
+ { SIM_RE_AUTHENTICATION, "Re-authentication" },
+ { SIM_CLIENT_ERROR, "Client-Error" },
+ { 0, NULL }
};
const value_string eap_aka_subtype_vals[] = {
- { AKA_CHALLENGE, "AKA-Challenge" },
- { AKA_AUTHENTICATION_REJECT, "AKA-Authentication-Reject" },
- { AKA_SYNCHRONIZATION_FAILURE, "AKA-Synchronization-Failure" },
- { AKA_IDENTITY, "AKA-Identity" },
- { AKA_NOTIFICATION, "Notification" },
- { AKA_REAUTHENTICATION, "Re-authentication" },
- { AKA_CLIENT_ERROR, "Client-Error" },
- { 0, NULL }
+ { AKA_CHALLENGE, "AKA-Challenge" },
+ { AKA_AUTHENTICATION_REJECT, "AKA-Authentication-Reject" },
+ { AKA_SYNCHRONIZATION_FAILURE, "AKA-Synchronization-Failure" },
+ { AKA_IDENTITY, "AKA-Identity" },
+ { AKA_NOTIFICATION, "Notification" },
+ { AKA_REAUTHENTICATION, "Re-authentication" },
+ { AKA_CLIENT_ERROR, "Client-Error" },
+ { 0, NULL }
};
/*
5) 3GPP TS 24.302
*/
-const value_string eap_sim_aka_attributes[] = {
- { 1, "AT_RAND" },
- { 2, "AT_AUTN" },
- { 3, "AT_RES" },
- { 4, "AT_AUTS" },
- { 6, "AT_PADDING" },
- { 7, "AT_NONCE_MT" },
- { 10, "AT_PERMANENT_ID_REQ" },
- { 11, "AT_MAC" },
- { 12, "AT_NOTIFICATION" },
- { 13, "AT_ANY_ID_REQ" },
- { 14, "AT_IDENTITY" },
- { 15, "AT_VERSION_LIST" },
- { 16, "AT_SELECTED_VERSION" },
- { 17, "AT_FULLAUTH_ID_REQ" },
- { 19, "AT_COUNTER" },
- { 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" },
- { 133, "AT_NEXT_REAUTH_ID" },
- { 134, "AT_CHECKCODE" },
- { 135, "AT_RESULT_IND" },
- { 136, "AT_BIDDING" },
- { 137, "AT_IPMS_IND" },
- { 138, "AT_IPMS_RES" },
- { 139, "AT_TRUST_IND" },
- { 0, NULL }
+const value_string eap_sim_aka_attribute_vals[] = {
+ { 1, "AT_RAND" },
+ { 2, "AT_AUTN" },
+ { 3, "AT_RES" },
+ { 4, "AT_AUTS" },
+ { 6, "AT_PADDING" },
+ { 7, "AT_NONCE_MT" },
+ { 10, "AT_PERMANENT_ID_REQ" },
+ { 11, "AT_MAC" },
+ { 12, "AT_NOTIFICATION" },
+ { 13, "AT_ANY_ID_REQ" },
+ { 14, "AT_IDENTITY" },
+ { 15, "AT_VERSION_LIST" },
+ { 16, "AT_SELECTED_VERSION" },
+ { 17, "AT_FULLAUTH_ID_REQ" },
+ { 19, "AT_COUNTER" },
+ { 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" },
+ { 133, "AT_NEXT_REAUTH_ID" },
+ { 134, "AT_CHECKCODE" },
+ { 135, "AT_RESULT_IND" },
+ { 136, "AT_BIDDING" },
+ { 137, "AT_IPMS_IND" },
+ { 138, "AT_IPMS_RES" },
+ { 139, "AT_TRUST_IND" },
+ { 0, NULL }
+};
+
+const value_string eap_ms_chap_v2_opcode_vals[] = {
+ { MS_CHAP_V2_CHALLENGE, "Challenge" },
+ { MS_CHAP_V2_RESPONSE, "Response" },
+ { MS_CHAP_V2_SUCCESS, "Success" },
+ { MS_CHAP_V2_FAILURE, "Failure" },
+ { MS_CHAP_V2_CHANGE_PASSWORD, "Change-Password" },
+ { 0, NULL }
};
/*
* State information for EAP-TLS (RFC2716) and Lightweight EAP:
*
- * http://www.missl.cs.umd.edu/wireless/ethereal/leap.txt
+ * http://www.missl.cs.umd.edu/wireless/ethereal/leap.txt
*
* Attach to all conversations:
*
- * a sequence number to be handed to "fragment_add_seq()" as
- * the fragment sequence number - if it's -1, no reassembly
- * is in progress, but if it's not, it's the sequence number
- * to use for the current fragment;
+ * a sequence number to be handed to "fragment_add_seq()" as
+ * the fragment sequence number - if it's -1, no reassembly
+ * is in progress, but if it's not, it's the sequence number
+ * to use for the current fragment;
*
- * a value to be handed to "fragment_add_seq()" as the
- * reassembly ID - when a reassembly is started, it's set to
- * the frame number of the current frame, i.e. the frame
- * that starts the reassembly;
+ * a value to be handed to "fragment_add_seq()" as the
+ * reassembly ID - when a reassembly is started, it's set to
+ * the frame number of the current frame, i.e. the frame
+ * that starts the reassembly;
*
- * an indication of the current state of LEAP negotiation,
- * with -1 meaning no LEAP negotiation is in progress.
+ * an indication of the current state of LEAP negotiation,
+ * with -1 meaning no LEAP negotiation is in progress.
*
* Attach to frames containing fragments of EAP-TLS messages the
* reassembly ID for those fragments, so we can find the reassembled
*/
typedef struct {
- int eap_tls_seq;
- guint32 eap_reass_cookie;
- int leap_state;
+ int eap_tls_seq;
+ guint32 eap_reass_cookie;
+ int leap_state;
} conv_state_t;
typedef struct {
- int info; /* interpretation depends on EAP message type */
+ int info; /* interpretation depends on EAP message type */
} frame_state_t;
/*********************************************************************
static gint ett_eap_sim_attr = -1;
static gint ett_eap_aka_attr = -1;
static gint ett_eap_exp_attr = -1;
+static gint ett_eap_tls_flags = -1;
static const fragment_items eap_tls_frag_items = {
- &ett_eap_tls_fragment,
- &ett_eap_tls_fragments,
- &hf_eap_tls_fragments,
- &hf_eap_tls_fragment,
- &hf_eap_tls_fragment_overlap,
- &hf_eap_tls_fragment_overlap_conflict,
- &hf_eap_tls_fragment_multiple_tails,
- &hf_eap_tls_fragment_too_long_fragment,
- &hf_eap_tls_fragment_error,
- &hf_eap_tls_fragment_count,
- NULL,
- &hf_eap_tls_reassembled_length,
- "fragments"
+ &ett_eap_tls_fragment,
+ &ett_eap_tls_fragments,
+ &hf_eap_tls_fragments,
+ &hf_eap_tls_fragment,
+ &hf_eap_tls_fragment_overlap,
+ &hf_eap_tls_fragment_overlap_conflict,
+ &hf_eap_tls_fragment_multiple_tails,
+ &hf_eap_tls_fragment_too_long_fragment,
+ &hf_eap_tls_fragment_error,
+ &hf_eap_tls_fragment_count,
+ NULL,
+ &hf_eap_tls_reassembled_length,
+ "fragments"
};
/**********************************************************************
Currently this is limited to WifiProtectedSetup. Maybe we need
a generic method to support EAP extended types ?
*********************************************************************/
-static int hf_eapext_vendorid = -1;
-static int hf_eapext_vendortype = -1;
+static int hf_eap_ext_vendor_id = -1;
+static int hf_eap_ext_vendor_type = -1;
/* Vendor-Type and Vendor-id */
#define WFA_VENDOR_ID 0x00372A
#define WFA_SIMPLECONFIG_TYPE 0x1
-static const value_string eapext_vendorid_vals[] = {
+static const value_string eap_ext_vendor_id_vals[] = {
{ WFA_VENDOR_ID, "WFA" },
{ 0, NULL }
};
-static const value_string eapext_vendortype_vals[] = {
+static const value_string eap_ext_vendor_type_vals[] = {
{ WFA_SIMPLECONFIG_TYPE, "SimpleConfig" },
{ 0, NULL }
};
static void
dissect_exteap(proto_tree *eap_tree, tvbuff_t *tvb, int offset,
- gint size, packet_info* pinfo)
+ gint size, packet_info* pinfo)
{
- proto_tree_add_item(eap_tree, hf_eapext_vendorid, tvb, offset, 3, ENC_BIG_ENDIAN);
+ proto_tree_add_item(eap_tree, hf_eap_ext_vendor_id, tvb, offset, 3, ENC_BIG_ENDIAN);
offset += 3; size -= 3;
- proto_tree_add_item(eap_tree, hf_eapext_vendortype, tvb, offset, 4, ENC_BIG_ENDIAN);
+ proto_tree_add_item(eap_tree, hf_eap_ext_vendor_type, tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4; size -= 4;
/* Generic method to support multiple vendor-defined extended types goes here :-) */
}
static void
-dissect_eap_mschapv2(proto_tree *eap_tree, tvbuff_t *tvb, int offset,
- gint size)
+dissect_eap_mschapv2(proto_tree *eap_tree, tvbuff_t *tvb, packet_info *pinfo, int offset,
+ gint size)
{
- gint left = size;
- gint ms_len;
- guint8 value_size;
- enum {
- MS_CHAPv2_CHALLENGE = 1,
- MS_CHAPv2_RESPONSE = 2,
- MS_CHAPv2_SUCCESS = 3,
- MS_CHAPv2_FAILURE = 4,
- MS_CHAPv2_CHANGE_PASSWORD = 5
- } opcode;
- static const value_string opcodes[] = {
- { MS_CHAPv2_CHALLENGE, "Challenge" },
- { MS_CHAPv2_RESPONSE, "Response" },
- { MS_CHAPv2_SUCCESS, "Success" },
- { MS_CHAPv2_FAILURE, "Failure" },
- { MS_CHAPv2_CHANGE_PASSWORD, "Change-Password" },
- { 0, NULL }
- };
-
- /* OpCode (1 byte), MS-CHAPv2-ID (1 byte), MS-Length (2 bytes), Data */
- opcode = tvb_get_guint8(tvb, offset);
- proto_tree_add_text(eap_tree, tvb, offset, 1,
- "OpCode: %d (%s)",
- opcode, val_to_str(opcode, opcodes, "Unknown"));
- offset++;
- left--;
- if (left <= 0)
- return;
-
- proto_tree_add_text(eap_tree, tvb, offset, 1, "MS-CHAPv2-ID: %d",
- tvb_get_guint8(tvb, offset));
- offset++;
- left--;
- if (left <= 0)
- return;
-
- ms_len = tvb_get_ntohs(tvb, offset);
- proto_tree_add_text(eap_tree, tvb, offset, 2, "MS-Length: %d%s",
- ms_len,
- ms_len != size ? " (invalid len)" : "");
- offset += 2;
- left -= 2;
-
- switch (opcode) {
- case MS_CHAPv2_CHALLENGE:
- if (left <= 0)
- break;
- value_size = tvb_get_guint8(tvb, offset);
- proto_tree_add_text(eap_tree, tvb, offset, 1,
- "Value-Size: %d", value_size);
- offset++;
- left--;
- proto_tree_add_text(eap_tree, tvb, offset, value_size,
- "Challenge: %s",
- tvb_bytes_to_str(tvb, offset, value_size));
- offset += value_size;
- left -= value_size;
- if (left <= 0)
- break;
- proto_tree_add_text(eap_tree, tvb, offset, left,
- "Name: %s",
- tvb_format_text(tvb, offset, left));
- break;
- case MS_CHAPv2_RESPONSE:
- if (left <= 0)
- break;
- value_size = tvb_get_guint8(tvb, offset);
- proto_tree_add_text(eap_tree, tvb, offset, 1,
- "Value-Size: %d", value_size);
- offset++;
- left--;
- if (value_size == 49) {
- proto_tree_add_text(eap_tree, tvb, offset, 16,
- "Peer-Challenge: %s",
- tvb_bytes_to_str(tvb, offset, 16));
- offset += 16;
- proto_tree_add_text(eap_tree, tvb, offset, 8,
- "Reserved, must be zero: %s",
- tvb_bytes_to_str(tvb, offset, 8));
- offset += 8;
- proto_tree_add_text(eap_tree, tvb, offset, 24,
- "NT-Response: %s",
- tvb_bytes_to_str(tvb, offset, 24));
- offset += 24;
- proto_tree_add_text(eap_tree, tvb, offset, 1,
- "Flags: %d",
- tvb_get_guint8(tvb, offset));
- offset++;
- left -= value_size;
- } else {
- proto_tree_add_text(eap_tree, tvb, offset, value_size,
- "Response (unknown length): %s",
- tvb_bytes_to_str(tvb, offset,
- value_size));
- offset += value_size;
- left -= value_size;
- }
- if (left <= 0)
- break;
- proto_tree_add_text(eap_tree, tvb, offset, left,
- "Name: %s",
- tvb_format_text(tvb, offset, left));
- break;
- case MS_CHAPv2_SUCCESS:
- if (left <= 0)
- break;
- proto_tree_add_text(eap_tree, tvb, offset, left,
- "Message: %s",
- tvb_format_text(tvb, offset, left));
- break;
- case MS_CHAPv2_FAILURE:
- if (left <= 0)
- break;
- proto_tree_add_text(eap_tree, tvb, offset, left,
- "Failure Request: %s",
- tvb_format_text(tvb, offset, left));
- break;
- default:
- proto_tree_add_text(eap_tree, tvb, offset, left,
- "Data (%d byte%s) Value: %s",
- left, plurality(left, "", "s"),
- tvb_bytes_to_str(tvb, offset, left));
- break;
- }
+ proto_item *item;
+ gint left = size;
+ gint ms_len;
+ guint8 value_size;
+ guint8 opcode;
+
+ /* OpCode (1 byte), MS-CHAPv2-ID (1 byte), MS-Length (2 bytes), Data */
+ opcode = tvb_get_guint8(tvb, offset);
+ proto_tree_add_item(eap_tree, hf_eap_ms_chap_v2_opcode, tvb, offset, 1, ENC_BIG_ENDIAN);
+ offset++;
+ left--;
+ if (left <= 0)
+ return;
+
+ proto_tree_add_item(eap_tree, hf_eap_ms_chap_v2_id, tvb, offset, 1, ENC_BIG_ENDIAN);
+ offset++;
+ left--;
+ if (left <= 0)
+ return;
+
+ item = proto_tree_add_item(eap_tree, hf_eap_ms_chap_v2_length, tvb, offset, 2, ENC_BIG_ENDIAN);
+ ms_len = tvb_get_ntohs(tvb, offset);
+ if (ms_len != size)
+ expert_add_info_format(pinfo, item, PI_PROTOCOL, PI_WARN, "Invalid Length");
+ offset += 2;
+ left -= 2;
+
+ switch (opcode) {
+ case MS_CHAP_V2_CHALLENGE:
+ if (left <= 0)
+ break;
+ value_size = tvb_get_guint8(tvb, offset);
+ proto_tree_add_item(eap_tree, hf_eap_ms_chap_v2_value_size,
+ tvb, offset, 1, ENC_BIG_ENDIAN);
+ offset++;
+ left--;
+ proto_tree_add_item(eap_tree, hf_eap_ms_chap_v2_challenge,
+ tvb, offset, value_size, ENC_NA);
+ offset += value_size;
+ left -= value_size;
+ if (left <= 0)
+ break;
+ proto_tree_add_item(eap_tree, hf_eap_ms_chap_v2_name,
+ tvb, offset, left, ENC_ASCII|ENC_NA);
+ break;
+ case MS_CHAP_V2_RESPONSE:
+ if (left <= 0)
+ break;
+ value_size = tvb_get_guint8(tvb, offset);
+ proto_tree_add_item(eap_tree, hf_eap_ms_chap_v2_value_size,
+ tvb, offset, 1, ENC_BIG_ENDIAN);
+ offset++;
+ left--;
+ if (value_size == 49) {
+ proto_tree_add_item(eap_tree, hf_eap_ms_chap_v2_peer_challenge,
+ tvb, offset, 16, ENC_NA);
+ offset += 16;
+ proto_tree_add_item(eap_tree, hf_eap_ms_chap_v2_reserved,
+ tvb, offset, 8, ENC_NA);
+ offset += 8;
+ proto_tree_add_item(eap_tree, hf_eap_ms_chap_v2_nt_response,
+ tvb, offset, 24, ENC_NA);
+ offset += 24;
+ proto_tree_add_item(eap_tree, hf_eap_ms_chap_v2_flags,
+ tvb, offset, 1, ENC_BIG_ENDIAN);
+ offset++;
+ left -= value_size;
+ } else {
+ proto_tree_add_text(eap_tree, tvb, offset, value_size,
+ "EAP-MS-CHAP-v2 Response (Unknown Length): %s",
+ tvb_bytes_to_str(tvb, offset, value_size));
+ offset += value_size;
+ left -= value_size;
+ }
+ if (left <= 0)
+ break;
+ proto_tree_add_item(eap_tree, hf_eap_ms_chap_v2_name, tvb, offset, left, ENC_ASCII|ENC_NA);
+ break;
+ case MS_CHAP_V2_SUCCESS:
+ if (left <= 0)
+ break;
+ proto_tree_add_item(eap_tree, hf_eap_ms_chap_v2_message,
+ tvb, offset, left, ENC_ASCII|ENC_NA);
+ break;
+ case MS_CHAP_V2_FAILURE:
+ if (left <= 0)
+ break;
+ proto_tree_add_item(eap_tree, hf_eap_ms_chap_v2_failure_request,
+ tvb, offset, left, ENC_ASCII|ENC_NA);
+ break;
+ default:
+ proto_tree_add_text(eap_tree, tvb, offset, left,
+ "EAP-MS-CHAP-v2 Data (%d byte%s): \"%s\"",
+ left, plurality(left, "", "s"),
+ tvb_bytes_to_str(tvb, offset, left));
+ break;
+ }
}
static void
dissect_eap_sim(proto_tree *eap_tree, tvbuff_t *tvb, int offset, gint size)
{
- gint left = size;
- proto_tree_add_item(eap_tree, hf_eap_sim_subtype, tvb, offset, 1, ENC_BIG_ENDIAN);
-
- offset++;
- left--;
-
- if (left < 2)
- return;
- proto_tree_add_text(eap_tree, tvb, offset, 2, "Reserved: %d",
- tvb_get_ntohs(tvb, offset));
- offset += 2;
- left -= 2;
-
- /* Rest of EAP-SIM data is in Type-Len-Value format. */
- while (left >= 2) {
- guint8 length;
- proto_item *pi;
- proto_tree *attr_tree;
- int aoffset;
- gint aleft;
- aoffset = offset;
- length = tvb_get_guint8(tvb, aoffset + 1);
- aleft = 4 * length;
-
- pi = proto_tree_add_item(eap_tree, hf_eap_sim_subtype_attribute, tvb, aoffset, aleft, ENC_BIG_ENDIAN);
- attr_tree = proto_item_add_subtree(pi, ett_eap_sim_attr);
- proto_tree_add_item(attr_tree, hf_eap_sim_subtype_type, tvb, aoffset, 1, ENC_BIG_ENDIAN);
- aoffset++;
- aleft--;
-
- if (aleft <= 0)
- break;
- proto_tree_add_item(attr_tree, hf_eap_sim_subtype_length, tvb, aoffset, 1, ENC_BIG_ENDIAN);
- aoffset++;
- aleft--;
- proto_tree_add_item(attr_tree, hf_eap_sim_subtype_value, tvb, aoffset, aleft, ENC_BIG_ENDIAN);
-
- offset += 4 * length;
- left -= 4 * length;
- }
+ gint left = size;
+ proto_tree_add_item(eap_tree, hf_eap_sim_subtype, tvb, offset, 1, ENC_BIG_ENDIAN);
+
+ offset++;
+ left--;
+
+ if (left < 2)
+ return;
+ proto_tree_add_item(eap_tree, hf_eap_sim_reserved, tvb, offset, 2, ENC_BIG_ENDIAN);
+ offset += 2;
+ left -= 2;
+
+ /* Rest of EAP-SIM data is in Type-Len-Value format. */
+ while (left >= 2) {
+ guint8 length;
+ proto_item *pi;
+ proto_tree *attr_tree;
+ int aoffset;
+ gint aleft;
+ aoffset = offset;
+ length = tvb_get_guint8(tvb, aoffset + 1);
+ aleft = 4 * length;
+
+ pi = proto_tree_add_item(eap_tree, hf_eap_sim_subtype_attribute, tvb, aoffset, aleft, ENC_BIG_ENDIAN);
+ attr_tree = proto_item_add_subtree(pi, ett_eap_sim_attr);
+ proto_tree_add_item(attr_tree, hf_eap_sim_subtype_type, tvb, aoffset, 1, ENC_BIG_ENDIAN);
+ aoffset++;
+ aleft--;
+
+ if (aleft <= 0)
+ break;
+ proto_tree_add_item(attr_tree, hf_eap_sim_subtype_length, tvb, aoffset, 1, ENC_BIG_ENDIAN);
+ aoffset++;
+ aleft--;
+ proto_tree_add_item(attr_tree, hf_eap_sim_subtype_value, tvb, aoffset, aleft, ENC_NA);
+
+ offset += 4 * length;
+ left -= 4 * length;
+ }
}
static void
dissect_eap_aka(proto_tree *eap_tree, tvbuff_t *tvb, int offset, gint size)
{
- gint left = size;
- proto_tree_add_item(eap_tree, hf_eap_aka_subtype, tvb, offset, 1, ENC_BIG_ENDIAN);
-
- offset++;
- left--;
-
- if (left < 2)
- return;
- proto_tree_add_text(eap_tree, tvb, offset, 2, "Reserved: %d",
- tvb_get_ntohs(tvb, offset));
- offset += 2;
- left -= 2;
-
- /* Rest of EAP-AKA data is in Type-Len-Value format. */
- while (left >= 2) {
- guint8 length;
- proto_item *pi;
- proto_tree *attr_tree;
- int aoffset;
- gint aleft;
- aoffset = offset;
- length = tvb_get_guint8(tvb, aoffset + 1);
- aleft = 4 * length;
-
- pi = proto_tree_add_item(eap_tree, hf_eap_aka_subtype_attribute, tvb, aoffset, aleft, ENC_BIG_ENDIAN);
- attr_tree = proto_item_add_subtree(pi, ett_eap_aka_attr);
- proto_tree_add_item(attr_tree, hf_eap_aka_subtype_type, tvb, aoffset, 1, ENC_BIG_ENDIAN);
- aoffset++;
- aleft--;
-
- if (aleft <= 0)
- break;
- proto_tree_add_item(attr_tree, hf_eap_aka_subtype_length, tvb, aoffset, 1, ENC_BIG_ENDIAN);
- aoffset++;
- aleft--;
- proto_tree_add_item(attr_tree, hf_eap_aka_subtype_value, tvb, aoffset, aleft, ENC_BIG_ENDIAN);
-
- offset += 4 * length;
- left -= 4 * length;
- }
+ gint left = size;
+ proto_tree_add_item(eap_tree, hf_eap_aka_subtype, tvb, offset, 1, ENC_BIG_ENDIAN);
+
+ offset++;
+ left--;
+
+ if (left < 2)
+ return;
+ proto_tree_add_item(eap_tree, hf_eap_aka_reserved, tvb, offset, 2, ENC_BIG_ENDIAN);
+ offset += 2;
+ left -= 2;
+
+ /* Rest of EAP-AKA data is in Type-Len-Value format. */
+ while (left >= 2) {
+ guint8 length;
+ proto_item *pi;
+ proto_tree *attr_tree;
+ int aoffset;
+ gint aleft;
+ aoffset = offset;
+ length = tvb_get_guint8(tvb, aoffset + 1);
+ aleft = 4 * length;
+
+ pi = proto_tree_add_item(eap_tree, hf_eap_aka_subtype_attribute, tvb, aoffset, aleft, ENC_BIG_ENDIAN);
+ attr_tree = proto_item_add_subtree(pi, ett_eap_aka_attr);
+ proto_tree_add_item(attr_tree, hf_eap_aka_subtype_type, tvb, aoffset, 1, ENC_BIG_ENDIAN);
+ aoffset++;
+ aleft--;
+
+ if (aleft <= 0)
+ break;
+ proto_tree_add_item(attr_tree, hf_eap_aka_subtype_length, tvb, aoffset, 1, ENC_BIG_ENDIAN);
+ aoffset++;
+ aleft--;
+ proto_tree_add_item(attr_tree, hf_eap_aka_subtype_value, tvb, aoffset, aleft, ENC_NA);
+
+ offset += 4 * length;
+ left -= 4 * length;
+ }
}
static int
conv_state_t *conversation_state;
frame_state_t *packet_state;
int leap_state;
- proto_tree *ti;
+ proto_tree *ti = NULL;
proto_tree *eap_tree = NULL;
+ proto_tree *eap_tls_flags_tree = NULL;
+ proto_item *eap_type_item = NULL;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "EAP");
col_clear(pinfo->cinfo, COL_INFO);
if (check_col(pinfo->cinfo, COL_INFO))
col_add_str(pinfo->cinfo, COL_INFO,
- val_to_str(eap_code, eap_code_vals, "Unknown code (0x%02X)"));
+ val_to_str(eap_code, eap_code_vals, "Unknown code (0x%02X)"));
/*
* Find a conversation to which we belong; create one if we don't find
*/
if (pinfo->destport == pinfo->match_uint) {
conversation = find_conversation(pinfo->fd->num, &pinfo->dst, &pinfo->src,
- pinfo->ptype, pinfo->destport,
- 0, NO_PORT_B);
+ pinfo->ptype, pinfo->destport,
+ 0, NO_PORT_B);
} else {
conversation = find_conversation(pinfo->fd->num, &pinfo->src, &pinfo->dst,
- pinfo->ptype, pinfo->srcport,
- 0, NO_PORT_B);
+ pinfo->ptype, pinfo->srcport,
+ 0, NO_PORT_B);
}
if (conversation == NULL) {
if (pinfo->destport == pinfo->match_uint) {
conversation = conversation_new(pinfo->fd->num, &pinfo->dst, &pinfo->src,
- pinfo->ptype, pinfo->destport,
- 0, NO_PORT2);
+ pinfo->ptype, pinfo->destport,
+ 0, NO_PORT2);
} else {
conversation = conversation_new(pinfo->fd->num, &pinfo->src, &pinfo->dst,
- pinfo->ptype, pinfo->srcport,
- 0, NO_PORT2);
+ pinfo->ptype, pinfo->srcport,
+ 0, NO_PORT2);
}
}
if (eap_code == EAP_FAILURE)
conversation_state->leap_state = -1;
- eap_len = tvb_get_ntohs(tvb, 2);
- len = eap_len;
+ eap_len = tvb_get_ntohs(tvb, 2);
+ len = eap_len;
- if (tree) {
- ti = proto_tree_add_item(tree, proto_eap, tvb, 0, len, ENC_NA);
- eap_tree = proto_item_add_subtree(ti, ett_eap);
+ if (tree) {
+ ti = proto_tree_add_item(tree, proto_eap, tvb, 0, len, ENC_NA);
+ eap_tree = proto_item_add_subtree(ti, ett_eap);
- proto_tree_add_uint(eap_tree, hf_eap_code, tvb, 0, 1, eap_code);
- }
+ proto_tree_add_item(eap_tree, hf_eap_code, tvb, 0, 1, ENC_BIG_ENDIAN);
+ }
- if (tree)
- proto_tree_add_item(eap_tree, hf_eap_identifier, tvb, 1, 1, ENC_BIG_ENDIAN);
+ if (tree)
+ proto_tree_add_item(eap_tree, hf_eap_identifier, tvb, 1, 1, ENC_BIG_ENDIAN);
- if (tree)
- proto_tree_add_uint(eap_tree, hf_eap_len, tvb, 2, 2, eap_len);
+ if (tree)
+ proto_tree_add_item(eap_tree, hf_eap_len, tvb, 2, 2, ENC_BIG_ENDIAN);
+
+ switch (eap_code) {
+
+ case EAP_SUCCESS:
+ case EAP_FAILURE:
+ break;
+
+ case EAP_REQUEST:
+ case EAP_RESPONSE:
+ eap_type = tvb_get_guint8(tvb, 4);
+
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
+ val_to_str(eap_type, eap_type_vals,
+ "Unknown type (0x%02x)"));
+ if (tree)
+ eap_type_item = proto_tree_add_item(eap_tree, hf_eap_type, tvb, 4, 1, ENC_BIG_ENDIAN);
+
+ if (len > 5 || (len == 5 && eap_type == EAP_TYPE_ID)) {
+ int offset = 5;
+ gint size = len - offset;
+
+ switch (eap_type) {
+ /*********************************************************************
+ **********************************************************************/
+ case EAP_TYPE_ID:
+ if (tree) {
+ proto_tree_add_item(eap_tree, hf_eap_identity, tvb, offset, size, ENC_ASCII|ENC_NA);
+ }
+ if(!pinfo->fd->flags.visited) {
+ conversation_state->leap_state = 0;
+ conversation_state->eap_tls_seq = -1;
+ }
+ break;
- switch (eap_code) {
+ /*********************************************************************
+ **********************************************************************/
+ case EAP_TYPE_NOTIFY:
+ if (tree) {
+ proto_tree_add_item(eap_tree, hf_eap_notification, tvb,
+ offset, size, ENC_ASCII|ENC_NA);
+ }
+ break;
- case EAP_SUCCESS:
- case EAP_FAILURE:
+ /*********************************************************************
+ **********************************************************************/
+ case EAP_TYPE_NAK:
+ if (tree) {
+ proto_tree_add_item(eap_tree, hf_eap_type_nak, tvb,
+ offset, 1, ENC_BIG_ENDIAN);
+ }
+ break;
+ /*********************************************************************
+ **********************************************************************/
+ case EAP_TYPE_MD5:
+ {
+ guint8 value_size = tvb_get_guint8(tvb, offset);
+ gint extra_len = size - 1 - value_size;
+ proto_item *item;
+
+ /* Warn that this is an insecure EAP type. */
+ expert_add_info_format(pinfo, eap_type_item, PI_SECURITY, PI_WARN, "Vulnerable to MITM attacks. If possible, change EAP type.");
+
+ item = proto_tree_add_item(eap_tree, hf_eap_md5_value_size, tvb, offset, 1, ENC_BIG_ENDIAN);
+ if (value_size > size - 1)
+ {
+ expert_add_info_format(pinfo, item, PI_PROTOCOL, PI_WARN, "Overflow");
+ value_size = size - 1;
+ }
+
+ offset++;
+ proto_tree_add_item(eap_tree, hf_eap_md5_value, tvb, offset, value_size, ENC_NA);
+ offset += value_size;
+ if (extra_len > 0) {
+ proto_tree_add_item(eap_tree, hf_eap_md5_extra_data, tvb, offset, extra_len, ENC_NA);
+ }
+ }
break;
- case EAP_REQUEST:
- case EAP_RESPONSE:
- eap_type = tvb_get_guint8(tvb, 4);
+ /*********************************************************************
+ EAP-TLS
+ **********************************************************************/
+ case EAP_TYPE_FAST:
+ case EAP_TYPE_PEAP:
+ case EAP_TYPE_TTLS:
+ case EAP_TYPE_TLS:
+ {
+ guint8 flags = tvb_get_guint8(tvb, offset);
+ gboolean more_fragments;
+ gboolean has_length;
+ gboolean is_start;
+ int eap_tls_seq = -1;
+ guint32 eap_reass_cookie = 0;
+ gboolean needs_reassembly = FALSE;
+
+ more_fragments = test_flag(flags,EAP_TLS_FLAG_M);
+ has_length = test_flag(flags,EAP_TLS_FLAG_L);
+ is_start = test_flag(flags,EAP_TLS_FLAG_S);
+
+ if (is_start)
+ conversation_state->eap_tls_seq = -1;
+
+ /* Flags field, 1 byte */
+ if (tree) {
+ ti = proto_tree_add_item(eap_tree, hf_eap_tls_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
+ eap_tls_flags_tree = proto_item_add_subtree(ti, ett_eap_tls_flags);
+ proto_tree_add_item(eap_tls_flags_tree, hf_eap_tls_flag_l, tvb, offset, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(eap_tls_flags_tree, hf_eap_tls_flag_m, tvb, offset, 1, ENC_BIG_ENDIAN);
+ proto_tree_add_item(eap_tls_flags_tree, hf_eap_tls_flag_s, tvb, offset, 1, ENC_BIG_ENDIAN);
+
+ if (eap_type == EAP_TYPE_PEAP || eap_type == EAP_TYPE_TTLS ||
+ eap_type == EAP_TYPE_FAST) {
+ proto_tree_add_item(eap_tls_flags_tree, hf_eap_tls_flags_version, tvb, offset, 1, ENC_BIG_ENDIAN);
+ }
+ }
+ size--;
+ offset++;
+
+ /* Length field, 4 bytes, OPTIONAL. */
+ if ( has_length ) {
+ if (tree)
+ proto_tree_add_item(eap_tree, hf_eap_tls_len, tvb, offset, 4, ENC_BIG_ENDIAN);
+ size -= 4;
+ offset += 4;
+ }
- if (check_col(pinfo->cinfo, COL_INFO))
- col_append_fstr(pinfo->cinfo, COL_INFO, ", %s",
- val_to_str(eap_type, eap_type_vals,
- "Unknown type (0x%02x)"));
- if (tree)
- proto_tree_add_uint(eap_tree, hf_eap_type, tvb, 4, 1, eap_type);
-
- if (len > 5 || (len == 5 && eap_type == EAP_TYPE_ID)) {
- int offset = 5;
- gint size = len - offset;
-
- switch (eap_type) {
- /*********************************************************************
- **********************************************************************/
- case EAP_TYPE_ID:
- if (tree) {
- proto_tree_add_item(eap_tree, hf_eap_identity, tvb, offset, size, ENC_BIG_ENDIAN);
+ if (size>0) {
+
+ tvbuff_t *next_tvb;
+ gint tvb_len;
+ gboolean save_fragmented;
+
+ tvb_len = tvb_length_remaining(tvb, offset);
+ if (size < tvb_len)
+ tvb_len = size;
+
+ /*
+ EAP/TLS is weird protocol (it comes from
+ Microsoft after all).
+
+ If we have series of fragmented packets,
+ then there's no way of knowing that from
+ the packet itself, if it is the last packet
+ in series, that is that the packet part of
+ bigger fragmented set of data.
+
+ The only way to know is, by knowing
+ that we are already in defragmentation
+ "mode" and we are expecing packet
+ carrying fragment of data. (either
+ because we have not received expected
+ amount of data, or because the packet before
+ had "F"ragment flag set.)
+
+ The situation is alleviated by fact that it
+ is simple ack/nack protcol so there's no
+ place for out-of-order packets like it is
+ possible with IP.
+
+ Anyway, point of this lengthy essay is that
+ we have to keep state information in the
+ conversation, so that we can put ourselves in
+ defragmenting mode and wait for the last packet,
+ and have to attach state to frames as well, so
+ that we can handle defragmentation after the
+ first pass through the capture.
+ */
+ /* See if we have a remembered defragmentation EAP ID. */
+ packet_state = (frame_state_t *)p_get_proto_data(pinfo->fd, proto_eap);
+ if (packet_state == NULL) {
+ /*
+ * We haven't - does this message require reassembly?
+ */
+ if (!pinfo->fd->flags.visited) {
+ /*
+ * This is the first time we've looked at this frame,
+ * so it wouldn't have any remembered information.
+ *
+ * Therefore, we check whether this conversation has
+ * a reassembly operation in progress, or whether
+ * this frame has the Fragment flag set.
+ */
+ if (conversation_state->eap_tls_seq != -1) {
+ /*
+ * There's a reassembly in progress; the sequence number
+ * of the previous fragment is
+ * "conversation_state->eap_tls_seq", and the reassembly
+ * ID is "conversation_state->eap_reass_cookie".
+ *
+ * We must include this frame in the reassembly.
+ * We advance the sequence number, giving us the
+ * sequence number for this fragment.
+ */
+ needs_reassembly = TRUE;
+ conversation_state->eap_tls_seq++;
+
+ eap_reass_cookie = conversation_state->eap_reass_cookie;
+ eap_tls_seq = conversation_state->eap_tls_seq;
+ } else if (more_fragments && has_length) {
+ /*
+ * This message has the Fragment flag set, so it requires
+ * reassembly. It's the message containing the first
+ * fragment (if it's a later fragment, the sequence
+ * number in the conversation state would not be -1).
+ *
+ * If it doesn't include a length, however, we can't
+ * do reassembly (either the message is in error, as
+ * the first fragment *must* contain a length, or we
+ * didn't capture the first fragment, and this just
+ * happens to be the first fragment we saw), so we
+ * also check that we have a length;
+ */
+ needs_reassembly = TRUE;
+ conversation_state->eap_reass_cookie = pinfo->fd->num;
+
+ /*
+ * Start the reassembly sequence number at 0.
+ */
+ conversation_state->eap_tls_seq = 0;
+
+ eap_tls_seq = conversation_state->eap_tls_seq;
+ eap_reass_cookie = conversation_state->eap_reass_cookie;
+ }
+
+ if (needs_reassembly) {
+ /*
+ * This frame requires reassembly; remember the reassembly
+ * ID for subsequent accesses to it.
+ */
+ packet_state = se_new(frame_state_t);
+ packet_state->info = eap_reass_cookie;
+ p_add_proto_data(pinfo->fd, proto_eap, packet_state);
+ }
+ }
+ } else {
+ /*
+ * This frame has a reassembly cookie associated with it, so
+ * it requires reassembly. We've already done the
+ * reassembly in the first pass, so "fragment_add_seq()"
+ * won't look at the sequence number; set it to 0.
+ *
+ * XXX - a frame isn't supposed to have more than one
+ * EAP message in it, but if it includes both an EAP-TLS
+ * message and a LEAP message, we might be mistakenly
+ * concluding it requires reassembly because the "info"
+ * field isn't -1. We could, I guess, pack both EAP-TLS
+ * ID and LEAP state into the structure, but that doesn't
+ * work if you have multiple EAP-TLS or LEAP messages in
+ * the frame.
+ *
+ * But it's not clear how much work we should do to handle
+ * a bogus message such as that; as long as we don't crash
+ * or do something else equally horrible, we may not
+ * have to worry about this at all.
+ */
+ needs_reassembly = TRUE;
+ eap_reass_cookie = packet_state->info;
+ eap_tls_seq = 0;
+ }
+
+ /*
+ We test here to see whether EAP-TLS packet
+ carry fragmented of TLS data.
+
+ If this is the case, we do reasembly below,
+ otherwise we just call dissector.
+ */
+ if (needs_reassembly) {
+ fragment_data *fd_head = NULL;
+
+ /*
+ * Yes, this frame contains a fragment that requires
+ * reassembly.
+ */
+ save_fragmented = pinfo->fragmented;
+ pinfo->fragmented = TRUE;
+ fd_head = fragment_add_seq(tvb, offset, pinfo,
+ eap_reass_cookie,
+ eap_tls_fragment_table,
+ eap_tls_seq,
+ size,
+ more_fragments);
+
+ if (fd_head != NULL) /* Reassembled */
+ {
+ proto_item *frag_tree_item;
+
+ next_tvb = tvb_new_child_real_data(tvb, fd_head->data,
+ fd_head->len,
+ fd_head->len);
+ add_new_data_source(pinfo, next_tvb, "Reassembled EAP-TLS");
+
+ show_fragment_seq_tree(fd_head, &eap_tls_frag_items,
+ eap_tree, pinfo, next_tvb, &frag_tree_item);
+
+ call_dissector(ssl_handle, next_tvb, pinfo, eap_tree);
+
+ /*
+ * We're finished reassembing this frame.
+ * Reinitialize the reassembly state.
+ */
+ if (!pinfo->fd->flags.visited)
+ conversation_state->eap_tls_seq = -1;
+ }
+
+ pinfo->fragmented = save_fragmented;
+
+ } else { /* this data is NOT fragmented */
+ next_tvb = tvb_new_subset(tvb, offset, tvb_len, size);
+ call_dissector(ssl_handle, next_tvb, pinfo, eap_tree);
+ }
}
- if(!pinfo->fd->flags.visited) {
- conversation_state->leap_state = 0;
- conversation_state->eap_tls_seq = -1;
- }
- break;
-
- /*********************************************************************
- **********************************************************************/
- case EAP_TYPE_NOTIFY:
- if (tree) {
- proto_tree_add_item(eap_tree, hf_eap_notification, tvb,
- offset, size, ENC_BIG_ENDIAN);
- }
- break;
- /*********************************************************************
- **********************************************************************/
- case EAP_TYPE_NAK:
- if (tree) {
- proto_tree_add_item(eap_tree, hf_eap_type_nak, tvb,
- offset, 1, ENC_BIG_ENDIAN);
- }
- break;
- /*********************************************************************
- **********************************************************************/
- case EAP_TYPE_MD5:
- if (tree) {
- guint8 value_size = tvb_get_guint8(tvb, offset);
- gint extra_len = size - 1 - value_size;
- proto_item *item;
- item = proto_tree_add_item(eap_tree, hf_eap_md5_value_size, tvb, offset, 1, ENC_BIG_ENDIAN);
- if (value_size > size - 1)
- {
- expert_add_info_format(pinfo, item, PI_MALFORMED, PI_ERROR, "Overflow");
- value_size = size - 1;
+ }
+ break; /* EAP_TYPE_TLS */
+
+ /*********************************************************************
+ Cisco's Lightweight EAP (LEAP)
+ http://www.missl.cs.umd.edu/wireless/ethereal/leap.txt
+ **********************************************************************/
+ case EAP_TYPE_LEAP:
+ {
+ guint8 count, namesize;
+
+ /* Warn that this is an insecure EAP type. */
+ expert_add_info_format(pinfo, eap_type_item, PI_SECURITY, PI_WARN, "Vulnerable to dictionary attacks. If possible, change EAP type. See http://www.cisco.com/warp/public/cc/pd/witc/ao350ap/prodlit/2331_pp.pdf");
+
+ /* Version (byte) */
+ if (tree) {
+ proto_tree_add_item(eap_tree, hf_eap_leap_version, tvb, offset, 1, ENC_BIG_ENDIAN);
}
-
- offset++;
- proto_tree_add_item(eap_tree, hf_eap_md5_value, tvb, offset, value_size, ENC_BIG_ENDIAN);
- offset += value_size;
- if (extra_len > 0) {
- proto_tree_add_text(eap_tree, tvb, offset, extra_len,
- "Extra data (%d byte%s): %s", extra_len,
- plurality(extra_len, "", "s"),
- tvb_bytes_to_str(tvb, offset, extra_len));
- }
- }
- break;
- /*********************************************************************
- EAP-TLS
- **********************************************************************/
- case EAP_TYPE_FAST:
- case EAP_TYPE_PEAP:
- case EAP_TYPE_TTLS:
- case EAP_TYPE_TLS:
- {
- guint8 flags = tvb_get_guint8(tvb, offset);
- gboolean more_fragments;
- gboolean has_length;
- gboolean is_start;
- int eap_tls_seq = -1;
- guint32 eap_reass_cookie = 0;
- gboolean needs_reassembly = FALSE;
-
- more_fragments = test_flag(flags,EAP_TLS_FLAG_M);
- has_length = test_flag(flags,EAP_TLS_FLAG_L);
- is_start = test_flag(flags,EAP_TLS_FLAG_S);
-
- if (is_start)
- conversation_state->eap_tls_seq = -1;
-
- /* Flags field, 1 byte */
- if (tree) {
- proto_tree_add_item(eap_tree, hf_eap_tls_flags, tvb, offset, 1, ENC_BIG_ENDIAN);
- proto_tree_add_item(eap_tree, hf_eap_tls_flag_l, tvb, offset, 1, ENC_BIG_ENDIAN);
- proto_tree_add_item(eap_tree, hf_eap_tls_flag_m, tvb, offset, 1, ENC_BIG_ENDIAN);
- proto_tree_add_item(eap_tree, hf_eap_tls_flag_s, tvb, offset, 1, ENC_BIG_ENDIAN);
-
- if (eap_type == EAP_TYPE_PEAP || eap_type == EAP_TYPE_TTLS ||
- eap_type == EAP_TYPE_FAST) {
- proto_tree_add_item(eap_tree, hf_eap_tls_flags_version, tvb, offset, 1, ENC_BIG_ENDIAN);
- }
- }
- size--;
- offset++;
-
- /* Length field, 4 bytes, OPTIONAL. */
- if ( has_length ) {
- if (tree)
- proto_tree_add_item(eap_tree, hf_eap_tls_len, tvb, offset, 4, ENC_BIG_ENDIAN);
- size -= 4;
- offset += 4;
- }
-
- if (size>0) {
-
- tvbuff_t *next_tvb;
- gint tvb_len;
- gboolean save_fragmented;
-
- tvb_len = tvb_length_remaining(tvb, offset);
- if (size < tvb_len)
- tvb_len = size;
-
- /*
- EAP/TLS is weird protocol (it comes from
- Microsoft after all).
-
- If we have series of fragmented packets,
- then there's no way of knowing that from
- the packet itself, if it is the last packet
- in series, that is that the packet part of
- bigger fragmented set of data.
-
- The only way to know is, by knowing
- that we are already in defragmentation
- "mode" and we are expecing packet
- carrying fragment of data. (either
- because we have not received expected
- amount of data, or because the packet before
- had "F"ragment flag set.)
-
- The situation is alleviated by fact that it
- is simple ack/nack protcol so there's no
- place for out-of-order packets like it is
- possible with IP.
-
- Anyway, point of this lengthy essay is that
- we have to keep state information in the
- conversation, so that we can put ourselves in
- defragmenting mode and wait for the last packet,
- and have to attach state to frames as well, so
- that we can handle defragmentation after the
- first pass through the capture.
- */
- /* See if we have a remembered defragmentation EAP ID. */
- packet_state = (frame_state_t *)p_get_proto_data(pinfo->fd, proto_eap);
- if (packet_state == NULL) {
- /*
- * We haven't - does this message require reassembly?
- */
- if (!pinfo->fd->flags.visited) {
- /*
- * This is the first time we've looked at this frame,
- * so it wouldn't have any remembered information.
- *
- * Therefore, we check whether this conversation has
- * a reassembly operation in progress, or whether
- * this frame has the Fragment flag set.
- */
- if (conversation_state->eap_tls_seq != -1) {
- /*
- * There's a reassembly in progress; the sequence number
- * of the previous fragment is
- * "conversation_state->eap_tls_seq", and the reassembly
- * ID is "conversation_state->eap_reass_cookie".
- *
- * We must include this frame in the reassembly.
- * We advance the sequence number, giving us the
- * sequence number for this fragment.
- */
- needs_reassembly = TRUE;
- conversation_state->eap_tls_seq++;
-
- eap_reass_cookie = conversation_state->eap_reass_cookie;
- eap_tls_seq = conversation_state->eap_tls_seq;
- } else if (more_fragments && has_length) {
- /*
- * This message has the Fragment flag set, so it requires
- * reassembly. It's the message containing the first
- * fragment (if it's a later fragment, the sequence
- * number in the conversation state would not be -1).
- *
- * If it doesn't include a length, however, we can't
- * do reassembly (either the message is in error, as
- * the first fragment *must* contain a length, or we
- * didn't capture the first fragment, and this just
- * happens to be the first fragment we saw), so we
- * also check that we have a length;
- */
- needs_reassembly = TRUE;
- conversation_state->eap_reass_cookie = pinfo->fd->num;
-
- /*
- * Start the reassembly sequence number at 0.
- */
- conversation_state->eap_tls_seq = 0;
-
- eap_tls_seq = conversation_state->eap_tls_seq;
- eap_reass_cookie = conversation_state->eap_reass_cookie;
- }
-
- if (needs_reassembly) {
- /*
- * This frame requires reassembly; remember the reassembly
- * ID for subsequent accesses to it.
- */
- packet_state = se_new(frame_state_t);
- packet_state->info = eap_reass_cookie;
- p_add_proto_data(pinfo->fd, proto_eap, packet_state);
- }
- }
- } else {
- /*
- * This frame has a reassembly cookie associated with it, so
- * it requires reassembly. We've already done the
- * reassembly in the first pass, so "fragment_add_seq()"
- * won't look at the sequence number; set it to 0.
- *
- * XXX - a frame isn't supposed to have more than one
- * EAP message in it, but if it includes both an EAP-TLS
- * message and a LEAP message, we might be mistakenly
- * concluding it requires reassembly because the "info"
- * field isn't -1. We could, I guess, pack both EAP-TLS
- * ID and LEAP state into the structure, but that doesn't
- * work if you have multiple EAP-TLS or LEAP messages in
- * the frame.
- *
- * But it's not clear how much work we should do to handle
- * a bogus message such as that; as long as we don't crash
- * or do something else equally horrible, we may not
- * have to worry about this at all.
- */
- needs_reassembly = TRUE;
- eap_reass_cookie = packet_state->info;
- eap_tls_seq = 0;
- }
-
- /*
- We test here to see whether EAP-TLS packet
- carry fragmented of TLS data.
-
- If this is the case, we do reasembly below,
- otherwise we just call dissector.
- */
- if (needs_reassembly) {
- fragment_data *fd_head = NULL;
-
- /*
- * Yes, this frame contains a fragment that requires
- * reassembly.
- */
- save_fragmented = pinfo->fragmented;
- pinfo->fragmented = TRUE;
- fd_head = fragment_add_seq(tvb, offset, pinfo,
- eap_reass_cookie,
- eap_tls_fragment_table,
- eap_tls_seq,
- size,
- more_fragments);
-
- if (fd_head != NULL) /* Reassembled */
- {
- proto_item *frag_tree_item;
-
- next_tvb = tvb_new_child_real_data(tvb, fd_head->data,
- fd_head->len,
- fd_head->len);
- add_new_data_source(pinfo, next_tvb, "Reassembled EAP-TLS");
-
- show_fragment_seq_tree(fd_head, &eap_tls_frag_items,
- eap_tree, pinfo, next_tvb, &frag_tree_item);
-
- call_dissector(ssl_handle, next_tvb, pinfo, eap_tree);
-
- /*
- * We're finished reassembing this frame.
- * Reinitialize the reassembly state.
- */
- if (!pinfo->fd->flags.visited)
- conversation_state->eap_tls_seq = -1;
- }
-
- pinfo->fragmented = save_fragmented;
-
- } else { /* this data is NOT fragmented */
- next_tvb = tvb_new_subset(tvb, offset, tvb_len, size);
- call_dissector(ssl_handle, next_tvb, pinfo, eap_tree);
- }
- }
- }
- break; /* EAP_TYPE_TLS */
- /*********************************************************************
- Cisco's Lightweight EAP (LEAP)
- http://www.missl.cs.umd.edu/wireless/ethereal/leap.txt
- **********************************************************************/
- case EAP_TYPE_LEAP:
- {
- guint8 field,count,namesize;
-
- /* Version (byte) */
- if (tree) {
- field = tvb_get_guint8(tvb, offset);
- proto_tree_add_text(eap_tree, tvb, offset, 1,
- "Version: %i",field);
- }
- offset++;
-
- /* Unused (byte) */
- if (tree) {
- field = tvb_get_guint8(tvb, offset);
- proto_tree_add_text(eap_tree, tvb, offset, 1,
- "Reserved: %i",field);
- }
- offset++;
-
- /* Count (byte) */
- count = tvb_get_guint8(tvb, offset);
- if (tree) {
- proto_tree_add_text(eap_tree, tvb, offset, 1,
- "Count: %i",count);
- }
- offset++;
-
- /* Data (byte*Count) */
- /* This part is state-dependent. */
-
- /* See if we've already remembered the state. */
- packet_state = (frame_state_t *)p_get_proto_data(pinfo->fd, proto_eap);
- if (packet_state == NULL) {
- /*
- * We haven't - compute the state based on the current
- * state in the conversation.
- */
- leap_state = conversation_state->leap_state;
-
- /* Advance the state machine. */
- if (leap_state==0) leap_state = 1; else
- if (leap_state==1) leap_state = 2; else
- if (leap_state==2) leap_state = 3; else
- if (leap_state==3) leap_state = 4; else
- if (leap_state==4) leap_state = -1;
-
- /*
- * Remember the state for subsequent accesses to this
- * frame.
- */
- packet_state = se_new(frame_state_t);
- packet_state->info = leap_state;
- p_add_proto_data(pinfo->fd, proto_eap, packet_state);
-
- /*
- * Update the conversation's state.
- */
- conversation_state->leap_state = leap_state;
- }
-
- /* Get the remembered state. */
- leap_state = packet_state->info;
-
- if (tree) {
-
- if (leap_state==1) {
- proto_tree_add_text(eap_tree, tvb, offset, count,
- "Peer Challenge [8] Random Value:\"%s\"",
- tvb_bytes_to_str(tvb, offset, count));
- } else if (leap_state==2) {
- proto_tree_add_text(eap_tree, tvb, offset, count,
- "Peer Response [24] NtChallengeResponse(%s)",
- tvb_bytes_to_str(tvb, offset, count));
- } else if (leap_state==3) {
- proto_tree_add_text(eap_tree, tvb, offset, count,
- "AP Challenge [8] Random Value:\"%s\"",
- tvb_bytes_to_str(tvb, offset, count));
- } else if (leap_state==4) {
- proto_tree_add_text(eap_tree, tvb, offset, count,
- "AP Response [24] ChallengeResponse(%s)",
- tvb_bytes_to_str(tvb, offset, count));
- } else {
- proto_tree_add_text(eap_tree, tvb, offset, count,
- "Data (%d byte%s): \"%s\"",
- count, plurality(count, "", "s"),
- tvb_bytes_to_str(tvb, offset, count));
- }
-
- } /* END: if (tree) */
-
- offset += count;
-
- /* Name (Length-(8+Count)) */
- namesize = eap_len - (8+count);
- if (tree) {
- proto_tree_add_text(eap_tree, tvb, offset, namesize,
- "Name (%d byte%s): %s",
- namesize, plurality(count, "", "s"),
- tvb_format_text(tvb, offset, namesize));
- }
- }
-
- break; /* EAP_TYPE_LEAP */
- /*********************************************************************
- EAP-MSCHAPv2 - draft-kamath-pppext-eap-mschapv2-00.txt
- **********************************************************************/
- case EAP_TYPE_MSCHAPV2:
- if (tree)
- dissect_eap_mschapv2(eap_tree, tvb, offset, size);
- break; /* EAP_TYPE_MSCHAPV2 */
- /*********************************************************************
- EAP-SIM - draft-haverinen-pppext-eap-sim-13.txt
- **********************************************************************/
- case EAP_TYPE_SIM:
- if (tree)
- dissect_eap_sim(eap_tree, tvb, offset, size);
- break; /* EAP_TYPE_SIM */
- /*********************************************************************
- 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 */
- /*********************************************************************
- EAP Expanded Type
- **********************************************************************/
- case EAP_TYPE_EXT:
- if (tree) {
- proto_item *expti = NULL;
- proto_tree *exptree = NULL;
-
- expti = proto_tree_add_text(eap_tree, tvb, offset, size, "Expanded Type");
- exptree = proto_item_add_subtree(expti, ett_eap_exp_attr);
- dissect_exteap(exptree, tvb, offset, size, pinfo);
- }
- break;
- /*********************************************************************
- **********************************************************************/
- default:
- if (tree) {
- proto_tree_add_text(eap_tree, tvb, offset, size,
- "Type-Data (%d byte%s) Value: %s",
- size, plurality(size, "", "s"),
- tvb_bytes_to_str(tvb, offset, size));
- }
- break;
- /*********************************************************************
- **********************************************************************/
- } /* switch (eap_type) */
+ offset++;
+
+ /* Unused (byte) */
+ if (tree) {
+ proto_tree_add_item(eap_tree, hf_eap_leap_reserved, tvb, offset, 1, ENC_BIG_ENDIAN);
+ }
+ offset++;
+ /* Count (byte) */
+ count = tvb_get_guint8(tvb, offset);
+ if (tree) {
+ proto_tree_add_item(eap_tree, hf_eap_leap_count, tvb, offset, 1, ENC_BIG_ENDIAN);
+ }
+ offset++;
+
+ /* Data (byte*Count) */
+ /* This part is state-dependent. */
+
+ /* See if we've already remembered the state. */
+ packet_state = (frame_state_t *)p_get_proto_data(pinfo->fd, proto_eap);
+ if (packet_state == NULL) {
+ /*
+ * We haven't - compute the state based on the current
+ * state in the conversation.
+ */
+ leap_state = conversation_state->leap_state;
+
+ /* Advance the state machine. */
+ if (leap_state==0) leap_state = 1; else
+ if (leap_state==1) leap_state = 2; else
+ if (leap_state==2) leap_state = 3; else
+ if (leap_state==3) leap_state = 4; else
+ if (leap_state==4) leap_state = -1;
+
+ /*
+ * Remember the state for subsequent accesses to this
+ * frame.
+ */
+ packet_state = se_new(frame_state_t);
+ packet_state->info = leap_state;
+ p_add_proto_data(pinfo->fd, proto_eap, packet_state);
+
+ /*
+ * Update the conversation's state.
+ */
+ conversation_state->leap_state = leap_state;
+ }
+
+ /* Get the remembered state. */
+ leap_state = packet_state->info;
+
+ if (tree) {
+ switch (leap_state) {
+ case 1:
+ proto_tree_add_item(eap_tree, hf_eap_leap_peer_challenge, tvb, offset, count, ENC_NA);
+ break;
+
+ case 2:
+ proto_tree_add_item(eap_tree, hf_eap_leap_peer_response, tvb, offset, count, ENC_NA);
+ break;
+
+ case 3:
+ proto_tree_add_item(eap_tree, hf_eap_leap_ap_challenge, tvb, offset, count, ENC_NA);
+ break;
+
+ case 4:
+ proto_tree_add_item(eap_tree, hf_eap_leap_ap_response, tvb, offset, count, ENC_NA);
+ break;
+
+ default:
+ proto_tree_add_text(eap_tree, tvb, offset, count,
+ "EAP-LEAP Data (%d byte%s): \"%s\"",
+ count, plurality(count, "", "s"),
+ tvb_bytes_to_str(tvb, offset, count));
+ break;
+ }
+ }
+
+ offset += count;
+
+ /* Name (Length-(8+Count)) */
+ namesize = eap_len - (8+count);
+ if (tree) {
+ proto_tree_add_item(eap_tree, hf_eap_leap_name, tvb, offset, namesize, ENC_ASCII|ENC_NA);
+ }
}
+ break; /* EAP_TYPE_LEAP */
+
+ /*********************************************************************
+ EAP-MSCHAPv2 - draft-kamath-pppext-eap-mschapv2-00.txt
+ **********************************************************************/
+ case EAP_TYPE_MSCHAPV2:
+ dissect_eap_mschapv2(eap_tree, tvb, pinfo, offset, size);
+ break; /* EAP_TYPE_MSCHAPV2 */
+
+ /*********************************************************************
+ EAP-SIM - draft-haverinen-pppext-eap-sim-13.txt
+ **********************************************************************/
+ case EAP_TYPE_SIM:
+ if (tree)
+ dissect_eap_sim(eap_tree, tvb, offset, size);
+ break; /* EAP_TYPE_SIM */
+
+ /*********************************************************************
+ 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 */
+
+ /*********************************************************************
+ EAP Expanded Type
+ **********************************************************************/
+ case EAP_TYPE_EXT:
+ {
+ proto_item *expti = NULL;
+ proto_tree *exptree = NULL;
+
+ expti = proto_tree_add_text(eap_tree, tvb, offset, size, "Expanded Type");
+ exptree = proto_item_add_subtree(expti, ett_eap_exp_attr);
+ dissect_exteap(exptree, tvb, offset, size, pinfo);
+ }
+ break;
+
+ /*********************************************************************
+ **********************************************************************/
+ default:
+ if (tree) {
+ proto_tree_add_text(eap_tree, tvb, offset, size,
+ "EAP Data (%d byte%s): \"%s\"",
+ size, plurality(size, "", "s"),
+ tvb_bytes_to_str(tvb, offset, size));
+ }
+ break;
+ /*********************************************************************
+ **********************************************************************/
+ } /* switch (eap_type) */
+
+ }
+
} /* switch (eap_code) */
return tvb_length(tvb);
proto_register_eap(void)
{
static hf_register_info hf[] = {
- { &hf_eap_code, {
- "Code", "eap.code", FT_UINT8, BASE_DEC,
- VALS(eap_code_vals), 0x0, NULL, HFILL }},
- { &hf_eap_identifier, {
- "Id", "eap.id", FT_UINT8, BASE_DEC,
- NULL, 0x0, NULL, HFILL }},
- { &hf_eap_len, {
- "Length", "eap.len", FT_UINT16, BASE_DEC,
- NULL, 0x0, NULL, HFILL }},
- { &hf_eap_type, {
- "Type", "eap.type", FT_UINT8, BASE_DEC,
- VALS(eap_type_vals), 0x0, NULL, HFILL }},
- { &hf_eap_type_nak, {
- "Desired Auth Type", "eap.desired_type", FT_UINT8, BASE_DEC,
- VALS(eap_type_vals), 0x0, NULL, HFILL }},
+ { &hf_eap_code, {
+ "Code", "eap.code", FT_UINT8, BASE_DEC,
+ VALS(eap_code_vals), 0x0, NULL, HFILL }},
+ { &hf_eap_identifier, {
+ "Id", "eap.id", FT_UINT8, BASE_DEC,
+ NULL, 0x0, NULL, HFILL }},
+ { &hf_eap_len, {
+ "Length", "eap.len", FT_UINT16, BASE_DEC,
+ NULL, 0x0, NULL, HFILL }},
+ { &hf_eap_type, {
+ "Type", "eap.type", FT_UINT8, BASE_DEC,
+ VALS(eap_type_vals), 0x0, NULL, HFILL }},
+ { &hf_eap_type_nak, {
+ "Desired Auth Type", "eap.desired_type", FT_UINT8, BASE_DEC,
+ VALS(eap_type_vals), 0x0, NULL, HFILL }},
{ &hf_eap_identity, {
- "Identity", "eap.identity", FT_STRING, BASE_NONE,
- NULL, 0x0, NULL, HFILL }},
+ "Identity", "eap.identity", FT_STRING, BASE_NONE,
+ NULL, 0x0, NULL, HFILL }},
{ &hf_eap_notification, {
- "Notification", "eap.notification", FT_STRING, BASE_NONE,
- NULL, 0x0, NULL, HFILL }},
+ "Notification", "eap.notification", FT_STRING, BASE_NONE,
+ NULL, 0x0, NULL, HFILL }},
{ &hf_eap_md5_value_size, {
- "Value-Size", "eap.md5.value_size", FT_UINT8, BASE_DEC,
- NULL, 0x0, NULL, HFILL }},
+ "EAP-MD5 Value-Size", "eap.md5.value_size", FT_UINT8, BASE_DEC,
+ NULL, 0x0, NULL, HFILL }},
{ &hf_eap_md5_value, {
- "Value", "eap.md5.value", FT_STRING, BASE_NONE,
- NULL, 0x0, NULL, HFILL }},
+ "EAP-MD5 Value", "eap.md5.value", FT_BYTES, BASE_NONE,
+ NULL, 0x0, NULL, HFILL }},
+ { &hf_eap_md5_extra_data, {
+ "EAP-MD5 Extra Data", "eap.md5.extra_data", FT_BYTES, BASE_NONE,
+ NULL, 0x0, NULL, HFILL }},
{ &hf_eap_tls_flags, {
- "EAP-TLS Flags", "eap.tls.flags", FT_UINT8, BASE_HEX,
- NULL, 0x0, NULL, HFILL }},
+ "EAP-TLS Flags", "eap.tls.flags", FT_UINT8, BASE_HEX,
+ NULL, 0x0, NULL, HFILL }},
{ &hf_eap_tls_flag_l, {
- "Length Included", "eap.tls.flags.len_included", FT_BOOLEAN, 8,
- NULL, EAP_TLS_FLAG_L, NULL, HFILL }},
+ "Length Included", "eap.tls.flags.len_included", FT_BOOLEAN, 8,
+ NULL, EAP_TLS_FLAG_L, NULL, HFILL }},
{ &hf_eap_tls_flag_m, {
- "More Fragments", "eap.tls.flags.more_fragments", FT_BOOLEAN, 8,
- NULL, EAP_TLS_FLAG_M, NULL, HFILL }},
+ "More Fragments", "eap.tls.flags.more_fragments", FT_BOOLEAN, 8,
+ NULL, EAP_TLS_FLAG_M, NULL, HFILL }},
{ &hf_eap_tls_flag_s, {
- "Start", "eap.tls.flags.start", FT_BOOLEAN, 8,
- NULL, EAP_TLS_FLAG_S, NULL, HFILL }},
+ "Start", "eap.tls.flags.start", FT_BOOLEAN, 8,
+ NULL, EAP_TLS_FLAG_S, NULL, HFILL }},
{ &hf_eap_tls_flags_version, {
- "Version", "eap.tls.flags.version", FT_UINT8, BASE_DEC,
- NULL, EAP_TLS_FLAGS_VERSION, NULL, HFILL }},
+ "Version", "eap.tls.flags.version", FT_UINT8, BASE_DEC,
+ NULL, EAP_TLS_FLAGS_VERSION, NULL, HFILL }},
{ &hf_eap_tls_len, {
- "EAP-TLS Length", "eap.tls.len", FT_UINT32, BASE_DEC,
- NULL, 0x0, NULL, HFILL }},
- { &hf_eap_tls_fragment,
- { "EAP-TLS Fragment", "eap.tls.fragment",
- FT_FRAMENUM, BASE_NONE, NULL, 0x0,
- NULL, HFILL }},
- { &hf_eap_tls_fragments,
- { "EAP-TLS Fragments", "eap.tls.fragments",
- FT_NONE, BASE_NONE, NULL, 0x0,
- NULL, HFILL }},
- { &hf_eap_tls_fragment_overlap,
- { "Fragment Overlap", "eap.tls.fragment.overlap",
- FT_BOOLEAN, BASE_NONE, NULL, 0x0,
- "Fragment overlaps with other fragments", HFILL }},
- { &hf_eap_tls_fragment_overlap_conflict,
- { "Conflicting Data In Fragment Overlap", "eap.tls.fragment.overlap.conflict",
- FT_BOOLEAN, BASE_NONE, NULL, 0x0,
- "Overlapping fragments contained conflicting data", HFILL }},
- { &hf_eap_tls_fragment_multiple_tails,
- { "Multiple Tail Fragments Found", "eap.tls.fragment.multipletails",
- FT_BOOLEAN, BASE_NONE, NULL, 0x0,
- "Several tails were found when defragmenting the packet", HFILL }},
- { &hf_eap_tls_fragment_too_long_fragment,
- { "Fragment Too Long", "eap.tls.fragment.toolongfragment",
- FT_BOOLEAN, BASE_NONE, NULL, 0x0,
- "Fragment contained data past end of packet", HFILL }},
- { &hf_eap_tls_fragment_error,
- { "Defragmentation Error", "eap.tls.fragment.error",
- FT_FRAMENUM, BASE_NONE, NULL, 0x0,
- "Defragmentation error due to illegal fragments", HFILL }},
- { &hf_eap_tls_fragment_count,
- { "Fragment Count", "eap.tls.fragment.count",
- FT_UINT32, BASE_DEC, NULL, 0x0,
- "Total length of the reassembled payload", HFILL }},
- { &hf_eap_tls_reassembled_length,
- { "Reassembled EAP-TLS Length", "eap.tls.reassembled.length",
- FT_UINT32, BASE_DEC, NULL, 0x0,
- "Total length of the reassembled payload", HFILL }},
+ "EAP-TLS Length", "eap.tls.len", FT_UINT32, BASE_DEC,
+ NULL, 0x0, NULL, HFILL }},
+ { &hf_eap_tls_fragment, {
+ "EAP-TLS Fragment", "eap.tls.fragment", FT_FRAMENUM, BASE_NONE,
+ NULL, 0x0, NULL, HFILL }},
+ { &hf_eap_tls_fragments, {
+ "EAP-TLS Fragments", "eap.tls.fragments", FT_NONE, BASE_NONE,
+ NULL, 0x0, NULL, HFILL }},
+ { &hf_eap_tls_fragment_overlap, {
+ "Fragment Overlap", "eap.tls.fragment.overlap", FT_BOOLEAN, BASE_NONE,
+ NULL, 0x0, "Fragment overlaps with other fragments", HFILL }},
+ { &hf_eap_tls_fragment_overlap_conflict, {
+ "Conflicting Data In Fragment Overlap", "eap.tls.fragment.overlap_conflict", FT_BOOLEAN, BASE_NONE,
+ NULL, 0x0, "Overlapping fragments contained conflicting data", HFILL }},
+ { &hf_eap_tls_fragment_multiple_tails, {
+ "Multiple Tail Fragments Found", "eap.tls.fragment.multiple_tails", FT_BOOLEAN, BASE_NONE,
+ NULL, 0x0, "Several tails were found when defragmenting the packet", HFILL }},
+ { &hf_eap_tls_fragment_too_long_fragment,{
+ "Fragment Too Long", "eap.tls.fragment.fragment.too_long", FT_BOOLEAN, BASE_NONE,
+ NULL, 0x0, "Fragment contained data past end of packet", HFILL }},
+ { &hf_eap_tls_fragment_error, {
+ "Defragmentation Error", "eap.tls.fragment.error", FT_FRAMENUM, BASE_NONE,
+ NULL, 0x0, "Defragmentation error due to illegal fragments", HFILL }},
+ { &hf_eap_tls_fragment_count, {
+ "Fragment Count", "eap.tls.fragment.count", FT_UINT32, BASE_DEC,
+ NULL, 0x0, "Total length of the reassembled payload", HFILL }},
+ { &hf_eap_tls_reassembled_length, {
+ "Reassembled EAP-TLS Length", "eap.tls.reassembled.len", FT_UINT32, BASE_DEC,
+ NULL, 0x0, "Total length of the reassembled payload", HFILL }},
{ &hf_eap_sim_subtype, {
- "Subtype", "eap.sim.subtype", FT_UINT8, BASE_DEC,
- VALS(eap_sim_subtype_vals), 0x0, NULL, HFILL }},
+ "EAP-SIM Subtype", "eap.sim.subtype", FT_UINT8, BASE_DEC,
+ VALS(eap_sim_subtype_vals), 0x0, NULL, HFILL }},
+ { &hf_eap_sim_reserved, {
+ "EAP-SIM Reserved", "eap.sim.reserved", FT_UINT16, BASE_HEX,
+ NULL, 0x0, NULL, HFILL }},
{ &hf_eap_sim_subtype_attribute, {
- "Attribute", "eap.sim.subtype.attribute", FT_UINT8, BASE_DEC,
- VALS(eap_sim_aka_attributes), 0x0, NULL, HFILL }},
+ "EAP-SIM Attribute", "eap.sim.subtype.attribute", FT_UINT8, BASE_DEC,
+ VALS(eap_sim_aka_attribute_vals), 0x0, NULL, HFILL }},
{ &hf_eap_sim_subtype_type, {
- "Type", "eap.sim.subtype.type", FT_UINT8, BASE_DEC,
- NULL, 0x0, NULL, HFILL }},
+ "EAP-SIM Type", "eap.sim.subtype.type", FT_UINT8, BASE_DEC,
+ NULL, 0x0, NULL, HFILL }},
{ &hf_eap_sim_subtype_length, {
- "Length", "eap.sim.subtype.length", FT_UINT8, BASE_DEC,
- NULL, 0x0, NULL, HFILL }},
+ "EAP-SIM Length", "eap.sim.subtype.len", FT_UINT8, BASE_DEC,
+ NULL, 0x0, NULL, HFILL }},
{ &hf_eap_sim_subtype_value, {
- "Value", "eap.sim.subtype.value", FT_STRING, BASE_NONE,
- NULL, 0x0, NULL, HFILL }},
+ "EAP-SIM Value", "eap.sim.subtype.value", FT_BYTES, BASE_NONE,
+ NULL, 0x0, NULL, HFILL }},
{ &hf_eap_aka_subtype, {
- "Subtype", "eap.aka.subtype", FT_UINT8, BASE_DEC,
- VALS(eap_aka_subtype_vals), 0x0, NULL, HFILL }},
+ "EAP-AKA Subtype", "eap.aka.subtype", FT_UINT8, BASE_DEC,
+ VALS(eap_aka_subtype_vals), 0x0, NULL, HFILL }},
+ { &hf_eap_aka_reserved, {
+ "EAP-AKA Reserved", "eap.aka.reserved", FT_UINT16, BASE_HEX,
+ NULL, 0x0, NULL, HFILL }},
{ &hf_eap_aka_subtype_attribute, {
- "Attribute", "eap.aka.subtype.attribute", FT_UINT8, BASE_DEC,
- VALS(eap_sim_aka_attributes), 0x0, NULL, HFILL }},
+ "EAP-AKA Attribute", "eap.aka.subtype.attribute", FT_UINT8, BASE_DEC,
+ VALS(eap_sim_aka_attribute_vals), 0x0, NULL, HFILL }},
{ &hf_eap_aka_subtype_type, {
- "Type", "eap.aka.subtype.type", FT_UINT8, BASE_DEC,
- NULL, 0x0, NULL, HFILL }},
+ "EAP-AKA Type", "eap.aka.subtype.type", FT_UINT8, BASE_DEC,
+ NULL, 0x0, NULL, HFILL }},
{ &hf_eap_aka_subtype_length, {
- "Length", "eap.aka.subtype.length", FT_UINT8, BASE_DEC,
- NULL, 0x0, NULL, HFILL }},
+ "EAP-AKA Length", "eap.aka.subtype.len", FT_UINT8, BASE_DEC,
+ NULL, 0x0, NULL, HFILL }},
{ &hf_eap_aka_subtype_value, {
- "Value", "eap.aka.subtype.value", FT_STRING, BASE_NONE,
- NULL, 0x0, NULL, HFILL }},
-
- /* Expanded type fields */
- { &hf_eapext_vendorid,
- { "Vendor Id", "eap.ext.vendor_id",
- FT_UINT16, BASE_HEX, VALS(eapext_vendorid_vals), 0x0,
- NULL, HFILL }},
- { &hf_eapext_vendortype,
- { "Vendor Type", "eap.ext.vendor_type",
- FT_UINT8, BASE_HEX, VALS(eapext_vendortype_vals), 0x0,
- NULL, HFILL }}
-
+ "EAP-AKA Value", "eap.aka.subtype.value", FT_BYTES, BASE_NONE,
+ NULL, 0x0, NULL, HFILL }},
+ { &hf_eap_leap_version, {
+ "EAP-LEAP Version", "eap.leap.version", FT_UINT8, BASE_DEC,
+ NULL, 0x0, NULL, HFILL }},
+ { &hf_eap_leap_reserved, {
+ "EAP-LEAP Reserved", "eap.leap.reserved", FT_UINT8, BASE_HEX,
+ NULL, 0x0, NULL, HFILL }},
+ { &hf_eap_leap_count, {
+ "EAP-LEAP Count", "eap.leap.count", FT_UINT8, BASE_DEC,
+ NULL, 0x0, NULL, HFILL }},
+ { &hf_eap_leap_peer_challenge, {
+ "EAP-LEAP Peer-Challenge", "eap.leap.peer_challenge", FT_BYTES, BASE_NONE,
+ NULL, 0x0, NULL, HFILL }},
+ { &hf_eap_leap_peer_response, {
+ "EAP-LEAP Peer-Response", "eap.leap.peer_response", FT_BYTES, BASE_NONE,
+ NULL, 0x0, NULL, HFILL }},
+ { &hf_eap_leap_ap_challenge, {
+ "EAP-LEAP AP-Challenge", "eap.leap.ap_challenge", FT_BYTES, BASE_NONE,
+ NULL, 0x0, NULL, HFILL }},
+ { &hf_eap_leap_ap_response, {
+ "EAP-LEAP AP-Response", "eap.leap.ap_response", FT_BYTES, BASE_NONE,
+ NULL, 0x0, NULL, HFILL }},
+ { &hf_eap_leap_name, {
+ "EAP-LEAP Name", "eap.leap.name", FT_STRING, BASE_NONE,
+ NULL, 0x0, NULL, HFILL }},
+ { &hf_eap_ms_chap_v2_opcode, {
+ "EAP-MS-CHAP-v2 OpCode", "eap.ms_chap_v2.opcode", FT_UINT8, BASE_DEC,
+ VALS(eap_ms_chap_v2_opcode_vals), 0x0, NULL, HFILL }},
+ { &hf_eap_ms_chap_v2_id, {
+ "EAP-MS-CHAP-v2 Id", "eap.ms_chap_v2.id", FT_UINT8, BASE_DEC,
+ NULL, 0x0, NULL, HFILL }},
+ { &hf_eap_ms_chap_v2_length, {
+ "EAP-MS-CHAP-v2 Length", "eap.ms_chap_v2.length", FT_UINT16, BASE_DEC,
+ NULL, 0x0, NULL, HFILL }},
+ { &hf_eap_ms_chap_v2_value_size, {
+ "EAP-MS-CHAP-v2 Value-Size", "eap.ms_chap_v2.value_size", FT_UINT8, BASE_DEC,
+ NULL, 0x0, NULL, HFILL }},
+ { &hf_eap_ms_chap_v2_challenge, {
+ "EAP-MS-CHAP-v2 Challenge", "eap.ms_chap_v2.challenge", FT_BYTES, BASE_NONE,
+ NULL, 0x0, NULL, HFILL }},
+ { &hf_eap_ms_chap_v2_name, {
+ "EAP-MS-CHAP-v2 Name", "eap.ms_chap_v2.name", FT_STRING, BASE_NONE,
+ NULL, 0x0, NULL, HFILL }},
+ { &hf_eap_ms_chap_v2_peer_challenge, {
+ "EAP-MS-CHAP-v2 Peer-Challenge", "eap.ms_chap_v2.peer_challenge", FT_BYTES, BASE_NONE,
+ NULL, 0x0, NULL, HFILL }},
+ { &hf_eap_ms_chap_v2_reserved, {
+ "EAP-MS-CHAP-v2 Reserved", "eap.ms_chap_v2.reserved", FT_BYTES, BASE_NONE,
+ NULL, 0x0, NULL, HFILL }},
+ { &hf_eap_ms_chap_v2_nt_response, {
+ "EAP-MS-CHAP-v2 NT-Response", "eap.ms_chap_v2.nt_response", FT_BYTES, BASE_NONE,
+ NULL, 0x0, NULL, HFILL }},
+ { &hf_eap_ms_chap_v2_flags, {
+ "EAP-MS-CHAP-v2 Flags", "eap.ms_chap_v2.flags", FT_UINT8, BASE_HEX,
+ NULL, 0x0, NULL, HFILL }},
+ { &hf_eap_ms_chap_v2_message, {
+ "EAP-MS-CHAP-v2 Message", "eap.ms_chap_v2.message", FT_STRING, BASE_NONE,
+ NULL, 0x0, NULL, HFILL }},
+ { &hf_eap_ms_chap_v2_failure_request, {
+ "EAP-MS-CHAP-v2 Failure-Request", "eap.ms_chap_v2.failure_request", FT_STRING, BASE_NONE,
+ NULL, 0x0, NULL, HFILL }},
+ /* Expanded type fields */
+ { &hf_eap_ext_vendor_id, {
+ "EAP-EXT Vendor Id", "eap.ext.vendor_id", FT_UINT16, BASE_HEX,
+ VALS(eap_ext_vendor_id_vals), 0x0, NULL, HFILL }},
+ { &hf_eap_ext_vendor_type, {
+ "EAP-EXT Vendor Type", "eap.ext.vendor_type", FT_UINT8, BASE_HEX,
+ VALS(eap_ext_vendor_type_vals), 0x0, NULL, HFILL }}
};
static gint *ett[] = {
- &ett_eap,
- &ett_eap_tls_fragment,
- &ett_eap_tls_fragments,
- &ett_eap_sim_attr,
- &ett_eap_aka_attr,
- &ett_eap_exp_attr
+ &ett_eap,
+ &ett_eap_tls_fragment,
+ &ett_eap_tls_fragments,
+ &ett_eap_sim_attr,
+ &ett_eap_aka_attr,
+ &ett_eap_exp_attr,
+ &ett_eap_tls_flags
};
proto_eap = proto_register_protocol("Extensible Authentication Protocol",
- "EAP", "eap");
+ "EAP", "eap");
proto_register_field_array(proto_eap, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
eap_handle = find_dissector("eap");
dissector_add_uint("ppp.protocol", PPP_EAP, eap_handle);
}
+/*
+ * Editor modelines
+ *
+ * Local Variables:
+ * c-basic-offset: 2
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * ex: set shiftwidth=2 tabstop=8 expandtab:
+ * :indentSize=2:tabSize=8:noTabs=true:
+ */
git.samba.org / metze / wireshark / wip.git / blobdiff