diff options
| author | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-11-15 20:52:41 +0000 |
|---|---|---|
| committer | morriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-11-15 20:52:41 +0000 |
| commit | 08709c11b62f3c30e7080018de6c388485bb26e3 (patch) | |
| tree | cd4568693402abd1e4152a63810bbcacecf3ee0a /epan/dissectors/packet-zbee-security.c | |
| parent | 6acf01801a2e8f066d79312d64ada603ea04f15c (diff) | |
From Fred Fierling via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5395 :
The ZigBee security dissector was not recording the short to long address
mappings in Security Headers, preventing the decryption of some payloads. This
patch eliminates the Undecoded warnings in packets 1 and 19 in this test
capture: https://bugs.wireshark.org/bugzilla/attachment.cgi?id=5457
The keys to decrypt these packets are listed in the bug.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34886 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-zbee-security.c')
| -rw-r--r-- | epan/dissectors/packet-zbee-security.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/epan/dissectors/packet-zbee-security.c b/epan/dissectors/packet-zbee-security.c index 3bf0fb1b2f..c70a7a4436 100644 --- a/epan/dissectors/packet-zbee-security.c +++ b/epan/dissectors/packet-zbee-security.c @@ -65,9 +65,6 @@ static gboolean zbee_security_parse_key(const gchar *, guint8 *, gboolean); static void proto_init_zbee_security(void); /* Field pointers. */ -#if 0 -static int hf_zbee_sec_level = -1; -#endif static int hf_zbee_sec_key_id = -1; static int hf_zbee_sec_nonce = -1; static int hf_zbee_sec_counter = -1; @@ -217,11 +214,6 @@ static GSList *zbee_pc_keyring = NULL; void zbee_security_register(module_t *zbee_prefs, int proto) { static hf_register_info hf[] = { -#if 0 - { &hf_zbee_sec_level, - { "Level", "zbee.sec.level", FT_UINT8, BASE_HEX, VALS(zbee_sec_level_names), ZBEE_SEC_CONTROL_LEVEL, - NULL, HFILL }}, -#endif { &hf_zbee_sec_key_id, { "Key Id", "zbee.sec.key", FT_UINT8, BASE_HEX, VALS(zbee_sec_key_names), ZBEE_SEC_CONTROL_KEY, NULL, HFILL }}, @@ -440,10 +432,6 @@ dissect_zbee_secure(tvbuff_t *tvb, packet_info *pinfo, proto_tree* tree, guint o #ifdef HAVE_LIBGCRYPT guint8 *enc_buffer; guint8 *dec_buffer; -#if 0 - guint8 buffer[ZBEE_SEC_CONST_BLOCKSIZE+1]; - guint8 *key_buffer = buffer; -#endif gboolean decrypted; GSList **nwk_keyring; GSList *GSList_i; @@ -517,6 +505,12 @@ dissect_zbee_secure(tvbuff_t *tvb, packet_info *pinfo, proto_tree* tree, guint o if (tree) { proto_tree_add_eui64(sec_tree, hf_zbee_sec_src64, tvb, offset, 8, packet.src64); } + + if (!pinfo->fd->flags.visited && nwk_hints && ieee_hints ) { + /* record this mapping */ + nwk_hints->map_rec = ieee802154_addr_update(&zbee_nwk_map, nwk_hints->src, + ieee_hints->src_pan, packet.src64, pinfo->current_proto, pinfo->fd->num); + } offset += 8; } else { |