osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

EAPOL-MKA: Included fixes for the distributed sak handling. 

Change-Id: Id91ba408266f18a9336811bf9d8b875796ea0cc1
Reviewed-on: https://code.wireshark.org/review/6582
Reviewed-by: maisheri <maisheri.hitesh@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This commit is contained in:
maisheri 2015-01-17 14:05:38 +05:30 committed by Alexis La Goutte
parent 62ea3194ed
commit aa1057daba
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.mailmap
View File

@ -14,6 +14,7 @@ Gilbert Ramirez <gram@alumni.rice.edu> <gilramir@cisco.com>
Gerald Combs <gerald@wireshark.org> <gerald@zing.org> Gerald Combs <gerald@wireshark.org> <gerald@zing.org>
Hadriel Kaplan <hadrielk@yahoo.com> <hadriel@128technology.com> Hadriel Kaplan <hadrielk@yahoo.com> <hadriel@128technology.com>
Hannes R. Boehm <hannes@boehm.org> hannes <hannes@localhost> 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> Irene Ruengeler <ruengeler@wireshark.org>
Irene Rüngeler <ruengeler@wireshark.org> 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> Irene Rüngeler <ruengeler@wireshark.org> <I.Ruengeler@fh-muenster.de>

3
AUTHORS
View File

@ -3644,6 +3644,9 @@ Enrico Jorns <ejo[AT]pengutronix.de> {
CANopen dissector enhancements and fixes CANopen dissector enhancements and fixes
} }
Hitesh K Maisheri <maisheri.hitesh[AT]gmail.com> {
EAPOL-MKA support
}
and by: and by:

22
epan/dissectors/packet-mka.c
View File

@ -1,5 +1,7 @@
/* packet-mka.c /* packet-mka.c
* Routines for EAPOL-MKA 802.1X authentication header disassembly * 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 * (From IEEE Draft P802.1X/D11; is there a later draft, or a
* final standard? If so, check it.) * 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; offset += 4;
proto_tree_add_item(distributed_sak_tree, hf_mka_macsec_cipher_suite, proto_tree_add_item(distributed_sak_tree, hf_mka_macsec_cipher_suite,
tvb, offset, 4, ENC_NA); tvb, offset, 8, ENC_NA);
offset += 4; offset += 8;
proto_tree_add_item(distributed_sak_tree, hf_mka_aes_key_wrap_sak, proto_tree_add_item(distributed_sak_tree, hf_mka_aes_key_wrap_sak,
tvb, offset, 24, ENC_NA); tvb, offset, 24, ENC_NA);
offset += 24; offset += 24;
break; 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: default:
proto_tree_add_expert(distributed_sak_tree, pinfo, &ei_mka_undecoded, tvb, offset, distributed_sak_len); proto_tree_add_expert(distributed_sak_tree, pinfo, &ei_mka_undecoded, tvb, offset, distributed_sak_len);
offset += distributed_sak_len; offset += distributed_sak_len;
@ -716,7 +732,7 @@ proto_register_mka(void)
{ &hf_mka_macsec_cipher_suite, { { &hf_mka_macsec_cipher_suite, {
"MACsec Cipher Suite", "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 }}, NULL, HFILL }},
{ &hf_mka_kmd, { { &hf_mka_kmd, {