diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2017-07-28 21:01:48 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-07-29 05:45:38 +0000 |
| commit | 621ff8e6166f448d807ebabed582810adc42cd57 (patch) | |
| tree | 51069d1d15fb88796e9e244a3528d3fdb1e29481 | |
| parent | 66fff5df49520ac6e43f24aba3308f1c3e0ad205 (diff) | |
MKA: Track offset correctly in Dist. SAK dissection
When handling a Distributed SAK parameter set with long SAK tracking
the offset was done incorrectly. Fix proposed by Rich Dubrawski.
Also remove the mask from XPN suspension time, it has none.
Bug: 13927
Change-Id: Iba1018632c719a86eaa24a304e1743210b3b3a1c
Reviewed-on: https://code.wireshark.org/review/22836
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-mka.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-mka.c b/epan/dissectors/packet-mka.c index 47bd916310..8c193a49ae 100644 --- a/epan/dissectors/packet-mka.c +++ b/epan/dissectors/packet-mka.c @@ -405,7 +405,7 @@ dissect_distributed_sak(proto_tree *mka_tree, packet_info *pinfo, tvbuff_t *tvb, proto_tree_add_item(distributed_sak_tree, hf_mka_aes_key_wrap_sak, tvb, offset, distributed_sak_len - 12, ENC_NA); - offset += (distributed_sak_len + 12); + offset += (distributed_sak_len - 12); } else { @@ -957,7 +957,7 @@ proto_register_mka(void) { &hf_mka_suspension_time, { "Suspension time", "mka.suspension_time", - FT_UINT8, BASE_DEC, NULL, 0xc0, + FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_mka_icv, { |