diff options
| -rw-r--r-- | .mailmap | 1 | ||||
| -rw-r--r-- | AUTHORS | 3 | ||||
| -rw-r--r-- | epan/dissectors/packet-mka.c | 22 |
3 files changed, 23 insertions, 3 deletions
@@ -14,6 +14,7 @@ Gilbert Ramirez <gram@alumni.rice.edu> <gilramir@cisco.com> Gerald Combs <gerald@wireshark.org> <gerald@zing.org> Hadriel Kaplan <hadrielk@yahoo.com> <hadriel@128technology.com> Hannes R. Boehm <hannes@boehm.org> hannes <hannes@localhost> +Hitesh K. Maisheri <maisheri.hitesh@gmail.com> <hmaisher@cisco.com> Irene Rüngeler <ruengeler@wireshark.org> Irene Ruengeler <ruengeler@wireshark.org> Irene Rüngeler <ruengeler@wireshark.org> ruengeler <ruengeler@wireshark.org> Irene Rüngeler <ruengeler@wireshark.org> <I.Ruengeler@fh-muenster.de> @@ -3644,6 +3644,9 @@ Enrico Jorns <ejo[AT]pengutronix.de> { CANopen dissector enhancements and fixes } +Hitesh K Maisheri <maisheri.hitesh[AT]gmail.com> { + EAPOL-MKA support +} and by: diff --git a/epan/dissectors/packet-mka.c b/epan/dissectors/packet-mka.c index 360df2a20e..346010958c 100644 --- a/epan/dissectors/packet-mka.c +++ b/epan/dissectors/packet-mka.c @@ -1,5 +1,7 @@ /* packet-mka.c * Routines for EAPOL-MKA 802.1X authentication header disassembly + * Copyright 2014, Hitesh K Maisheri <maisheri.hitesh@gmail.com> + * * (From IEEE Draft P802.1X/D11; is there a later draft, or a * final standard? If so, check it.) * @@ -335,14 +337,28 @@ dissect_distributed_sak(proto_tree *mka_tree, packet_info *pinfo, tvbuff_t *tvb, offset += 4; proto_tree_add_item(distributed_sak_tree, hf_mka_macsec_cipher_suite, - tvb, offset, 4, ENC_NA); - offset += 4; + tvb, offset, 8, ENC_NA); + offset += 8; proto_tree_add_item(distributed_sak_tree, hf_mka_aes_key_wrap_sak, tvb, offset, 24, ENC_NA); offset += 24; break; + case 50: + proto_tree_add_item(distributed_sak_tree, hf_mka_key_number, + tvb, offset, 4, ENC_NA); + offset += 4; + + proto_tree_add_item(distributed_sak_tree, hf_mka_macsec_cipher_suite, + tvb, offset, 8, ENC_NA); + offset += 8; + + proto_tree_add_item(distributed_sak_tree, hf_mka_aes_key_wrap_sak, + tvb, offset, 38, ENC_NA); + offset += 38; + break; + default: proto_tree_add_expert(distributed_sak_tree, pinfo, &ei_mka_undecoded, tvb, offset, distributed_sak_len); offset += distributed_sak_len; @@ -716,7 +732,7 @@ proto_register_mka(void) { &hf_mka_macsec_cipher_suite, { "MACsec Cipher Suite", "mka.macsec_cipher_suite", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }}, { &hf_mka_kmd, { |