diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2013-09-04 04:47:38 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2013-09-04 04:47:38 +0000 |
| commit | 55f7519fc28a56fa51929524a634024d03bf9c48 (patch) | |
| tree | 2de1ee100a3559d05e4b0747778ef806f3085512 /epan/dissectors/packet-rfid-pn532.c | |
| parent | a59b5388a9be2c9a8e8f5ed24e2eafa67e692d72 (diff) | |
From Tyson Key:
Update the InListPassiveTarget Response handler to dissect the ISO 14443-A ATQA, and UID values from InnoVision/Broadcom Topaz cards/tags.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9096
svn path=/trunk/; revision=51745
Diffstat (limited to 'epan/dissectors/packet-rfid-pn532.c')
| -rw-r--r-- | epan/dissectors/packet-rfid-pn532.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/epan/dissectors/packet-rfid-pn532.c b/epan/dissectors/packet-rfid-pn532.c index 1e3f2cb59b..7f150f8c17 100644 --- a/epan/dissectors/packet-rfid-pn532.c +++ b/epan/dissectors/packet-rfid-pn532.c @@ -454,6 +454,16 @@ dissect_pn532(tvbuff_t * tvb, packet_info * pinfo, proto_tree *tree) /* Add the Protocol Info */ proto_tree_add_item(pn532_tree, hf_pn532_14443b_proto_info, tvb, 13, 3, ENC_BIG_ENDIAN); } + + /* InnoVision Jewel/Topaz (ISO 14443-A/proprietary) */ + if (tvb_reported_length(tvb) == 12) { + + /* Add the ATQA/SENS_RES (0x0C00)*/ + proto_tree_add_item(pn532_tree, hf_pn532_14443a_atqa, tvb, 4, 2, ENC_BIG_ENDIAN); + + /* Add the UID (4 bytes) */ + proto_tree_add_item(pn532_tree, hf_pn532_14443a_uid, tvb, 6, 4, ENC_BIG_ENDIAN); + } /* Probably one of: * a MiFare DESFire card (23 bytes), |