summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2012-10-15 16:03:10 +0000
committerAnders Broman <anders.broman@ericsson.com>2012-10-15 16:03:10 +0000
commit1a68210e9f6a8070f0885c754ac58020fa3bc59e (patch)
tree58af33f99e0df30141a4a4d6bf101c12d733ac94
parent0181043045ffbd6d77424c3798c6504515422d30 (diff)
downloadwireshark-1a68210e9f6a8070f0885c754ac58020fa3bc59e.tar.gz
Copy over:
Revision 45559 -From Rakesh Kumar: Error in AUXILIARY SECURITY HEADER Parsing for 802.15.4 in dissect_ieee802154_common function. Offset should be +8 not +4 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7864 svn path=/trunk-1.8/; revision=45560
-rw-r--r--epan/dissectors/packet-ieee802154.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-ieee802154.c b/epan/dissectors/packet-ieee802154.c
index 626e6e9208..55215f4e40 100644
--- a/epan/dissectors/packet-ieee802154.c
+++ b/epan/dissectors/packet-ieee802154.c
@@ -946,7 +946,7 @@ dissect_ieee802154_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, g
packet->key_source.addr64 = tvb_get_ntoh64(tvb, offset);
proto_tree_add_uint64(field_tree, hf_ieee802154_aux_sec_key_source, tvb, offset, 8, packet->key_source.addr64);
proto_item_set_len(ti, 1 + 8);
- offset += 4;
+ offset += 8;
}
/* Add key identifier. */
packet->key_index = tvb_get_guint8(tvb, offset);