aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-usb-ccid.c
AgeCommit message (Collapse)AuthorFilesLines
2014-12-21Cleanup use of #includes in non-generated epan/dissector/*.cBill Meier1-2/+1
Specifically: - Set packet.h to be the first wireshark #include after config.h and "system" #includes. packet.h added as an #include in some cases when missing. - Remove some #includes included (directly/indirectly) in packet.h. E.g., glib.h. (Done only for those files including packet.h). - As needed, move "system" #includes to be after config.h and before wireshark #includes. - Rework various #include file specifications for consistency. - Misc. Change-Id: Ifaa1a14b50b69fbad38ea4838a49dfe595c54c95 Reviewed-on: https://code.wireshark.org/review/5923 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-13Use ENC_LITTLE_ENDIAN when fetching FT_U?INT8 fields ...Bill Meier1-1/+1
(for some dissectors which fetch all other integral fields using ENC_LITTLE_ENDIAN). Change-Id: Ica72a68ac560f2920d61e0769de83130557c46fd Reviewed-on: https://code.wireshark.org/review/5752 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-16use supported/unsupported for the bitfield elementsMartin Kaiser1-24/+24
order them from MSB to LSB Change-Id: Ie758285c2cf5d19e00d6d256c49acca15ce81168 Reviewed-on: https://code.wireshark.org/review/4746 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-10-16smartcard descriptor: start a bitfield for the featuresMartin Kaiser1-2/+23
Change-Id: I636cfdfcd61d6d5dc041f9dbc657244d94e88b7f Reviewed-on: https://code.wireshark.org/review/4745 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-10-13smartcard descriptor: bitmask for pin support fieldMartin Kaiser1-3/+19
Change-Id: If0e5cd90ff73bfbb211970f9a24974119c6ec550 Reviewed-on: https://code.wireshark.org/review/4664 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-10-13smartcard descriptor:Martin Kaiser1-2/+21
dissect number of lines, characters per line in the lcd layout Change-Id: I36c9c6f2e73cdfde8a9b7c4ad0450d93722fca2b Reviewed-on: https://code.wireshark.org/review/4663 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-10-13smartcard descriptor: the lcd layout is two bytes longMartin Kaiser1-1/+1
Change-Id: Ie8fd82d652a9a3fc1d3139ab610bbaa7a5ecd32d Reviewed-on: https://code.wireshark.org/review/4662 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-09-08Eliminate proto_tree_add_text from some of the dissectors.Michael Mann1-6/+10
Other minor cleanups while in the area. Change-Id: I623d941e53128f169e55dfc629547b4221fa72fc Reviewed-on: https://code.wireshark.org/review/4021 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-07convert to proto_tree_add_subtree[_format]Michael Mann1-4/+3
Change-Id: Ie10ac4f5f04a23344d183e095bbafb23c6409144 Reviewed-on: https://code.wireshark.org/review/2904 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-20Rename dissector_add_handle() to dissector_add_for_decode_as().Guy Harris1-3/+3
Hopefully that name makes it clear what the routiner's purpose is, and will encourage people to use it rather than using dissector_add_uint() with a bogus integer value. Change-Id: Ic5be456d0ad40b176aab01712ab7b13aed5de2a8 Reviewed-on: https://code.wireshark.org/review/2483 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-06-19Revert "Fixup: tvb_* -> tvb_captured"Michael Mann1-1/+1
https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html This reverts commit 246fe2ca4c67d8c98caa84e2f57694f6322e2f96. Change-Id: Ib24bae0198c13a84bd7f731bf4af921212109a8f Reviewed-on: https://code.wireshark.org/review/2430 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-18Fixup: tvb_* -> tvb_capturedDario Lombardo1-1/+1
Change-Id: I9209c1271967405c34c1b6fa43e1726a4d3a5a3f Reviewed-on: https://code.wireshark.org/review/2377 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-06-07tvb_new_subset -> tvb_new_subset_length when length parameters are equal.Michael Mann1-1/+1
tvb_new_subset -> tvb_new_subset_remaining it appears that's what the intention is. Change-Id: I2334bbf3f10475b3c22391392fc8b6864454de2d Reviewed-on: https://code.wireshark.org/review/1999 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^ \* \$Id\$/,+1 d') Fix manually some typo (in export_object_dicom.c and crc16-plain.c) Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8 Reviewed-on: https://code.wireshark.org/review/497 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2013-12-23From Michal Labedzki via ↵Alexis La Goutte1-8/+8
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 USB: CCID: Add ACR122 dissector to be autodetected by VendorId/ProductID svn path=/trunk/; revision=54407
2013-12-23From Michal Labedzki via ↵Alexis La Goutte1-37/+21
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9562 USB: Add support for Bluetooth Ubertooth with initial version of Low Energy Link Layer protocol and NFC ACR122 NFC: Add ACR122 USB dongle dissector ACS ACR122 is compatibile with PN532, but has its own API. Dissect it. svn path=/trunk/; revision=54406
2013-12-12remove unused dissector tablesMartin Kaiser1-5/+0
http://www.wireshark.org/lists/wireshark-dev/201312/msg00137.html svn path=/trunk/; revision=53977
2013-12-09Reject the packet if data is NULL without doing anything else.Chris Maynard1-2/+5
Note: We *might* want to do _something_ but that _something_ should be well-defined and consistent across all dissectors. Previously, some dissectors called proto_tree_add_text() to add some error message text to the tree, while others called DISSECTOR_ASSERT(). svn path=/trunk/; revision=53895
2013-11-21USB CCID and PN532_HCI can be now used in Decode As. Bug 9445 ↵Michael Mann1-4/+9
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9445) From Michal Labedzki svn path=/trunk/; revision=53463
2013-11-12Remove usb_conv_info_t from packet_info and pass the data directly into the ↵Michael Mann1-4/+4
subdissectors. Bug 9413 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9413) svn path=/trunk/; revision=53274
2013-10-31USB/PN532: Fix dissector to use new dissector *data instead of ↵Michael Mann1-5/+11
private_data. Bug 9333 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9333) From Michal Labedzki svn path=/trunk/; revision=53003
2013-10-13whitespace fixes; mostly: remove trailing blanksBill Meier1-3/+3
svn path=/trunk/; revision=52591
2013-10-04dissect the remaining components of the smart card descriptorMartin Kaiser1-4/+100
(without going into too much detail) svn path=/trunk/; revision=52355
2013-09-10From: Michal Labedzki <michal.labedzki@tieto.com>Anders Broman1-4/+24
Subject: [PATCH] NFC: PN532: Implement half of PN532 specification Implement TG_* and RF_* commands/responses. Also decode "status" field in all commands. Update USB CCID to decode "escaped" payload. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9119 svn path=/trunk/; revision=51916
2013-09-09More dissector table UI name changes (a continuation of r51904).Chris Maynard1-1/+1
svn path=/trunk/; revision=51907
2013-09-07From Tyson Key via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9105 :Pascal Quantin1-0/+3
Add additional PN532 opcodes, and update USB CCID dissector to skip status word in PN532 responses svn path=/trunk/; revision=51812
2013-09-04dissect some more items of the smart card descriptorMartin Kaiser1-6/+78
svn path=/trunk/; revision=51758
2013-09-02register a dissector for ccid class specific descriptorsMartin Kaiser1-4/+59
start dissecting the smart card descriptor --This line, and those below, will be ignored-e M epan/dissectors/packet-usb-ccid.c svn path=/trunk/; revision=51645
2013-06-13From Tyson Key via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8791 :Pascal Quantin1-3/+10
Improve dissection of GSM SIM payloads in USB CCID packets svn path=/trunk/; revision=49915
2013-05-31Check USB CCID length to see if subdissectors should be called instead of ↵Michael Mann1-107/+80
doing it blindly (which could lead to malformed packets). Bug 8735 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8735) Also minor cleanup of column info. svn path=/trunk/; revision=49651
2013-01-26Always call sub-dissectors with the top-level tree.Evan Huus1-3/+3
svn path=/trunk/; revision=47299
2013-01-26USB-CCID header is always 10 bytes and may contain payloads, so settingEvan Huus1-1/+1
it to run to the end of the packet was confusing and/or wrong. svn path=/trunk/; revision=47296
2012-09-20We always HAVE_CONFIG_H so don't bother checking whether we have it or not.Jeff Morriss1-2/+0
svn path=/trunk/; revision=45017
2012-06-28Update Free Software Foundation address.Jakub Zawadzki1-1/+1
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536
2012-05-17Tabs -> spacespascal1-128/+128
svn path=/trunk/; revision=42691
2012-05-17From Martin Kaiser via ↵pascal1-0/+14
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7255 : dissector for generic ISO 7816 messages (atr and apdus) svn path=/trunk/; revision=42689
2012-03-13Remove if(tree) to address ↵Jeff Morriss1-195/+192
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6940#c3 svn path=/trunk/; revision=41533
2012-03-13From Tyson Key: Support for dissection of PN532 payloads in USB CCID ↵Anders Broman1-10/+49
packets. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6940 svn path=/trunk/; revision=41520
2012-02-23From Tyson Key:Anders Broman1-7/+3
Clean up redundant Data handlers in the CCID dissector. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6860 svn path=/trunk/; revision=41156
2012-02-23From Tyson Key:Anders Broman1-2/+37
Support for switching USB CCID PC_to_RDR_XfrBlock payload dissectors https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6853 svn path=/trunk/; revision=41151
2012-01-28From Tyson Key:Anders Broman1-16/+16
Update the CCID dissector's filter/handler names. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6752 svn path=/trunk/; revision=40755
2012-01-13Minor cleanup:Bill Meier1-48/+46
- Move a global var to be local to a fcn; - Remove an unneeded forward declaration; - Do some minor reformatting. svn path=/trunk/; revision=40486
2011-11-14Very minor cleanup: remove some unneeded #includes & some trailing whitespaceBill Meier1-6/+4
svn path=/trunk/; revision=39830
2011-11-07From Tyson Key via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6155Alexis La Goutte1-0/+401
Dissector for the USB Integrated Circuit Card Interface Device Class (CCID) I've implemented a reasonable subset of a dissector for the USB CCID specification (as described at http://www.usb.org/developers/devclass_docs/DWG_Smart-Card_CCID_Rev110.pdf), during the course of experimenting with an ACS ACR122U ISO 14443 card reader and MiFare tokens. It currently identifies all of the message types listed in that specification,ng. From me: * Fix Clang Warning * Remove trailing whitespace from lines * Fix Checkhf (Remove a unused entry) * Added packet-rfid-mifare to Makefile.common and CMakeLists.txt svn path=/trunk/; revision=39750