Commit Graph

141 Commits

Author SHA1 Message Date
Henryk Plötz 47485362af + Add parse_response_4B
+ Limit read binary response in PN532 case to 0xf8 bytes
2010-02-28 06:09:59 +01:00
Henryk Plötz e960c92fbd Initial and very minimal support for ISO 14443-4 over PN532 over ISO 7816-3 T=0 on the ACR122 firmware 1.x 2010-02-26 02:27:26 +01:00
Henryk Plötz 8f5ec36f7a Move PN532 code to a separate class (I forgot how easy that is) 2010-02-26 02:27:26 +01:00
Henryk Plötz 331bfc4d47 Move all PC/SC specific stuff to a separate class structure for readers (thus preparing the way for non-PC/SC-readers)
This commit should be known as "Holy excessive layering, batman!"
2010-02-26 02:27:26 +01:00
Henryk Plötz 63d7c9d0a8 sha is deprecated, move to hashlib (probably removes support for old python versions) 2010-02-26 02:27:17 +01:00
Henryk Plötz 303d3ffdaf Add code for PN532 in the ACS ACR reader, needs to go somehwere else though 2010-02-25 10:49:21 +01:00
Henryk Plötz 985941e16e Copy the CLA value for the GET RESPONSE command from the original APDU 2010-02-25 10:48:58 +01:00
Henryk Plötz c125823192 + Update E3 project file
+ Add ACOS6 SAM card, contained in ACS reader (tikitag/touchatag)
2010-02-24 02:59:13 +01:00
Henryk Plötz 86c7778022 Add VRS application and GUI (Public transport in Koeln and Bonn) 2010-02-24 02:57:44 +01:00
Henryk Plötz 42d2278cf8 + Make it possible for cards/applications to set Le for SELECT operations, use this in the passport application
+ Add code for nice tree formatting of EF/DF structures
2010-02-24 02:45:26 +01:00
Henryk Plötz 1b6509a0e7 Add AIDs for eID ("Neuer Personalausweis") and VRS ticket, fix RID for FSFE 2010-02-24 02:43:21 +01:00
hploetz 424a3c14c5 Make it possible for a card/application class to specify the P1 used for SELECT in the file case
Add an Application class (and AID) for NFC Forum Tag Type 4


git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@261 f711b948-2313-0410-aaa9-d29f33439f0b
2008-06-10 03:34:21 +00:00
hploetz 4cd1aa901c New ATRs
git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@256 f711b948-2313-0410-aaa9-d29f33439f0b
2008-05-25 00:15:08 +00:00
john 5540677e73 added lifecycle commands to CardOS
Passive Authentication for BAC MRTDs


git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@254 f711b948-2313-0410-aaa9-d29f33439f0b
2008-03-10 22:54:53 +00:00
hploetz 55a0b4d4a2 mifare desfire, miscellaneous
git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@250 f711b948-2313-0410-aaa9-d29f33439f0b
2007-11-14 12:42:46 +00:00
hploetz fa0e0c888c fix get_atr
git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@248 f711b948-2313-0410-aaa9-d29f33439f0b
2007-06-16 07:25:42 +00:00
hploetz c92a60fb10 Switch smartcard interface to pyscard from http://pyscard.sourceforge.net/
pycsc no longer supported
API change: utils doesn't export "pycsc" anymore
API change: utils.CommandLineArgumentHelper.connect now returns smartcard.CardService.CardService instance
API change: cards.generic_card.Card.__init__ and ...can_handle (and therefore cards.new_card_object) now expect CardService or CardConnection instance


git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@247 f711b948-2313-0410-aaa9-d29f33439f0b
2007-06-16 06:56:57 +00:00
hploetz dfb480db3a Prevent read_binary_file from falling into an infinite loop
git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@244 f711b948-2313-0410-aaa9-d29f33439f0b
2007-06-12 17:44:16 +00:00
hploetz 9d25ab83d2 .upper() for the mrz2 in used in bac
git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@242 f711b948-2313-0410-aaa9-d29f33439f0b
2007-06-11 03:43:58 +00:00
hploetz 2a0caea3c7 Incorporate some information from tr-03110-eac-1.0.pdf
git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@241 f711b948-2313-0410-aaa9-d29f33439f0b
2007-06-10 00:46:55 +00:00
hploetz 9a1a0ccdce sre is deprecated in python 2.5
git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@238 f711b948-2313-0410-aaa9-d29f33439f0b
2007-06-09 19:31:05 +00:00
hploetz 38bc6d9efc Can now display displayed portrait and displayed signature or usual mark
git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@236 f711b948-2313-0410-aaa9-d29f33439f0b
2007-06-09 06:40:04 +00:00
hploetz da589e2c77 Regression: read_com and friends were broken
Make decode_tag_list output more educational


git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@235 f711b948-2313-0410-aaa9-d29f33439f0b
2007-06-09 05:17:30 +00:00
hploetz f5a1777099 fixes in mrz parsing for uncommon cases
git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@234 f711b948-2313-0410-aaa9-d29f33439f0b
2007-06-09 05:01:08 +00:00
hploetz 6916b45f11 Reading from and saving to filesets works
git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@230 f711b948-2313-0410-aaa9-d29f33439f0b
2007-06-08 05:33:29 +00:00
hploetz 09ab2cbff7 Picture loading working
git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@229 f711b948-2313-0410-aaa9-d29f33439f0b
2007-06-08 04:54:41 +00:00
hploetz 3fa2f88419 Tool to read full passport information. Call without arguments to try without bac, or with mrz1 mrz2 or mrz2 to try with bac
git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@224 f711b948-2313-0410-aaa9-d29f33439f0b
2007-06-08 00:55:16 +00:00
hploetz d7aa71ca8d Centralize pycsc windows import hack
git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@222 f711b948-2313-0410-aaa9-d29f33439f0b
2007-06-08 00:14:22 +00:00
hploetz 94fbb4190c Passport parse code
git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@221 f711b948-2313-0410-aaa9-d29f33439f0b
2007-06-08 00:10:11 +00:00
hploetz 7d2f9b4da5 API change: let read_binary_file return two values
git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@220 f711b948-2313-0410-aaa9-d29f33439f0b
2007-06-08 00:09:55 +00:00
hploetz 84e812ebf7 Honor generic_card.DEBUG
git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@219 f711b948-2313-0410-aaa9-d29f33439f0b
2007-06-07 22:28:43 +00:00
hploetz bda175ccb2 fix mrz2 checksum calculation
git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@218 f711b948-2313-0410-aaa9-d29f33439f0b
2007-06-07 21:15:33 +00:00
hploetz 19b862ae24 Start passport parsing code
git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@217 f711b948-2313-0410-aaa9-d29f33439f0b
2007-06-07 21:04:20 +00:00
hploetz f6f29a90a9 Have a stab at parsing biometric data
git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@216 f711b948-2313-0410-aaa9-d29f33439f0b
2007-06-05 02:33:28 +00:00
hploetz a024e73aa6 MTCOS_Card_RFID is better than RFID_Card. (TODO: Find better API for such cases)
git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@214 f711b948-2313-0410-aaa9-d29f33439f0b
2007-06-05 02:32:43 +00:00
hploetz e4fa619d41 load_response and pretend_application commands
git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@213 f711b948-2313-0410-aaa9-d29f33439f0b
2007-06-05 02:31:17 +00:00
hploetz b56cd37306 Change output of ultralight cat to the customary 4 bytes per line
git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@209 f711b948-2313-0410-aaa9-d29f33439f0b
2007-06-02 06:58:48 +00:00
hploetz a5e9ead166 Differentiate 1k and 4k mifare classic
Add one SW
Forgot one docstring


git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@208 f711b948-2313-0410-aaa9-d29f33439f0b
2007-06-02 06:48:23 +00:00
hploetz 62a06241c0 API change: substitute new PURPOSE_GET_RESPONSE for PURPOSE_RETRY to match the actual semantics, add a different value for PURPOSE_RETRY to match the description
Refactor READ BINARY functionality out of iso_7816_4 into a building block
Implement READ BINARY (and "cat" command) for RFID storage cards using the new building block


git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@207 f711b948-2313-0410-aaa9-d29f33439f0b
2007-06-02 06:14:18 +00:00
hploetz a810933abc Add RFID_Card class. (I just discovered that section 3.2.2 of PC/SC 2.01 specifies handling of contactless storage cards such as mifare through an emulated APDU interface.)
git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@204 f711b948-2313-0410-aaa9-d29f33439f0b
2007-06-01 20:40:24 +00:00
hploetz a1b12fe941 Allow arbitrary parameters for select_application
git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@203 f711b948-2313-0410-aaa9-d29f33439f0b
2007-06-01 20:37:41 +00:00
hploetz 10a9dab1ef Allow SELECT APPLICATION and READ BINARY with given Le
Add resolve_symbolic_name convenience function
Add get_atr function
Implement STOP_ATRS functionality to stop ISO_7816_4_Card from accepting all cards, blacklist contactless storage cards


git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@192 f711b948-2313-0410-aaa9-d29f33439f0b
2007-05-30 16:47:43 +00:00
hploetz 758223149b Make passport_application work with windows
git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@191 f711b948-2313-0410-aaa9-d29f33439f0b
2007-05-08 09:50:47 +00:00
hploetz 47662ab48e Get working under Windows with http://cheeseshop.python.org/pypi/PyCSC/0.3 (with Python 2.5 for Windows)
Note: you additionally need pycrypto, the source of which you'll get from http://cheeseshop.python.org/pypi/pycrypto/2.0.1
  Compilation of pycrypto can work with cygwin in two steps: python setup.py build -c mingw32 and python setup.py install --skip-build


git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@190 f711b948-2313-0410-aaa9-d29f33439f0b
2007-05-08 09:23:25 +00:00
hploetz a94d4d8a32 easier to type alias
git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@189 f711b948-2313-0410-aaa9-d29f33439f0b
2007-05-08 09:19:11 +00:00
hploetz 47f7e768c1 Add config parameter to TCOS_Security_Environment._mac (was forgotten during refactoring)
git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@188 f711b948-2313-0410-aaa9-d29f33439f0b
2007-04-10 00:51:40 +00:00
hploetz 98f1dbe110 API change: DRIVER_NAME now is a (merged) list
git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@187 f711b948-2313-0410-aaa9-d29f33439f0b
2007-03-18 23:38:24 +00:00
hploetz 6aaff0ef86 Fix length for passports
git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@184 f711b948-2313-0410-aaa9-d29f33439f0b
2007-02-15 21:19:18 +00:00
hploetz e9a4d97dc8 decode_mrz
override check_sw


git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@183 f711b948-2313-0410-aaa9-d29f33439f0b
2007-02-15 21:16:33 +00:00
hploetz 09467b61a1 read_dg, read_sod and read_com commands
git-svn-id: svn+ssh://localhost/home/henryk/svn/cyberflex-shell/trunk@182 f711b948-2313-0410-aaa9-d29f33439f0b
2007-02-13 13:47:40 +00:00