From Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7255 :

dissector for generic ISO 7816 messages (atr and apdus)

svn path=/trunk/; revision=42689

1 files changed, 14 insertions, 0 deletions

diff --git a/epan/dissectors/packet-usb-ccid.c b/epan/dissectors/packet-usb-ccid.c
index e8324f0424..b32c6d6d3a 100644
--- a/epan/dissectors/packet-usb-ccid.c
+++ b/epan/dissectors/packet-usb-ccid.c
@@ -146,6 +146,7 @@ static gint ett_ccid = -1;
 /* Table of payload types - adapted from the I2C dissector */
 enum {
     SUB_DATA = 0,
+    SUB_ISO7816,
     SUB_GSM_SIM,
     SUB_PN532_ACS_PSEUDO_APDU,
 
@@ -288,6 +289,12 @@ dissect_ccid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	       }
       }
 
+      else if (sub_selected == SUB_ISO7816) {
+        /* sent/received is from the perspective of the card reader */
+        pinfo->p2p_dir = P2P_DIR_SENT;
+        call_dissector(sub_handles[SUB_ISO7816], next_tvb, pinfo, tree);
+      }
+
       /* The user probably wanted GSM SIM, or something else */
       else {
 	call_dissector(sub_handles[sub_selected], next_tvb, pinfo, tree);
@@ -330,6 +337,11 @@ dissect_ccid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 	  call_dissector(sub_handles[SUB_PN532_ACS_PSEUDO_APDU], next_tvb, pinfo, ccid_tree);
 	}
 
+        else if (sub_selected == SUB_ISO7816) {
+          pinfo->p2p_dir = P2P_DIR_RECV;
+          call_dissector(sub_handles[SUB_ISO7816], next_tvb, pinfo, tree);
+        }
+
 	else {
 	  call_dissector(sub_handles[SUB_DATA], next_tvb, pinfo, ccid_tree);
 	}
@@ -415,6 +427,7 @@ proto_register_ccid(void)
 
     static const enum_val_t sub_enum_vals[] = {
         { "data", "Data", SUB_DATA },
+        { "iso7816", "Generic ISO 7816", SUB_ISO7816 },
         { "gsm_sim", "GSM SIM", SUB_GSM_SIM },
 	{ "pn532", "NXP PN532 with ACS Pseudo-Header", SUB_PN532_ACS_PSEUDO_APDU},
         { NULL, NULL, 0 }
@@ -446,6 +459,7 @@ proto_reg_handoff_ccid(void)
     dissector_add_uint("usb.bulk", IF_CLASS_SMART_CARD, usb_ccid_bulk_handle);
 
     sub_handles[SUB_DATA] = find_dissector("data");
+    sub_handles[SUB_ISO7816] = find_dissector("iso7816");
     sub_handles[SUB_GSM_SIM] = find_dissector("gsm_sim");
     sub_handles[SUB_PN532_ACS_PSEUDO_APDU] = find_dissector("pn532");
 }