Commit Graph

2817 Commits

Author SHA1 Message Date
merlokk
8ab9b6d0ea sw 0x6cxx works 2018-12-18 16:14:52 +02:00
merlokk
f32088e25c fix states and get rid of INS code in receive (that code checks by controller) 2018-12-18 14:33:28 +02:00
merlokk
a759e94af0 add client side and get rid of reset 2018-12-17 23:48:56 +02:00
iceman1001
a963a7834c FIX: 'mem load' - bad memory allocation
CHG: calloc fixes
2018-12-17 14:01:18 +01:00
iceman1001
cecf709fe7 chg: 'script run mifare_ad' - minor fix 2018-12-14 20:27:11 +01:00
mazodude
d36f3d876b Remove unneeded function and place code in main 2018-12-14 20:14:47 +10:00
mazodude
f77bb94a86 Add changes to script as per iceman's suggestions 2018-12-14 16:57:51 +10:00
mazodude
edcb029af3 Add script to test for MADs 2018-12-14 15:31:50 +10:00
iceman1001
1ffddb2578 CHG: 'hf mfu dump' - simplify bin saving and added JSON dump format 2018-12-13 23:34:30 +01:00
merlokk
b06054732b code format 2018-12-10 15:04:03 +02:00
merlokk
ec17cade36 added TA1 decoding 2018-12-10 15:01:00 +02:00
iceman1001
16bfd49b8d CHG: 'hf 14a' - update to vendors list. (thanks to @horrordash for pointing it out)
See also:
http://isotc.iso.org/livelink/livelink?func=ll&objId=10432471&objAction=Open&nexturl=%2Flivelink%2Flivelink%3Ffunc%3Dll%26objId%3D8915579%26objAction%3Dbrowse%26viewType%3D1
2018-12-10 08:48:39 +01:00
Chris
7ceac11308 chg: Added some more Mifare sector trailer decoding (@Fl0-0) 2018-12-07 20:11:40 +01:00
RFID Research Group
749f0f6f3a Merge pull request #68 from merlokk/sc_atr
added basic atr decode
2018-12-07 19:19:23 +01:00
merlokk
384a277b43 added basic atr decode 2018-12-07 19:58:22 +02:00
RFID Research Group
04b7860096 Update default_pwd.dic
from https://github.com/Proxmark/proxmark3/pull/735/
2018-12-07 17:36:50 +01:00
merlokk
80d07bcaac added code if AIP not found 2018-12-06 20:04:28 +02:00
merlokk
17d0194aea small fix and block scan command 2018-12-06 19:47:57 +02:00
merlokk
34b53a5b48 exchange works 2018-12-06 14:44:55 +02:00
merlokk
ec3acc7d8a some of emv commands works in test mode 2018-12-05 19:23:13 +02:00
merlokk
312ec79e48 added sketch sc apdu 2018-12-05 17:27:28 +02:00
merlokk
4c7e5757f3 added channel parameter 2018-12-03 19:29:31 +02:00
merlokk
01a10bade7 Mastercard compute cryptographic checksum result will print anyway 2018-12-03 18:49:54 +02:00
merlokk
2245673262 fix search big loop 2018-12-03 18:46:11 +02:00
merlokk
e8671e6c18 fix emv command's help 2018-12-03 18:21:05 +02:00
merlokk
47d954c79f move emv commands to root 2018-12-03 18:16:25 +02:00
iceman1001
259dbadbe9 chg: output unified 2018-12-02 10:05:31 +01:00
iceman1001
2eee1663df chg: iso15693 small fix... 2018-11-30 21:04:32 +01:00
iceman1001
0372cb8a04 chg: iso15693 lua lib works. 2018-11-30 20:58:47 +01:00
merlokk
7c8377839e 4k fix 2018-11-30 20:33:46 +02:00
merlokk
2d932e49ac https://github.com/Proxmark/proxmark3/pull/725 2018-11-30 20:28:34 +02:00
merlokk
9f77f2741f added trailer decoding 2018-11-30 14:16:34 +02:00
iceman1001
a5898158c5 FIX: basic fixes for lua reader14a, reader14b, reader15
ADD: utils got iso15693 crc support
2018-11-30 01:41:39 +01:00
iceman1001
ccb0cd23f5 FIX: 'lua calc of iso15692 crc' - works better now 2018-11-30 01:19:57 +01:00
iceman1001
bd7ac487cd FIX: 'hf mf hardnested' - output misalignment 2018-11-29 23:44:50 +01:00
merlokk
9584074c00 fix memory error 2018-11-29 22:06:49 +02:00
iceman1001
0b5ee43392 FIX: remove linker directive warnings used with compiler in CLANG, OS X. 2018-11-29 17:59:46 +01:00
iceman1001
3c88bb5e59 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2018-11-29 17:53:57 +01:00
iceman1001
b64fdafc40 ADD: basic iso15693 comms in lua support. Not fully functional 2018-11-29 17:53:24 +01:00
Iceman
55dff20530 Merge pull request #54 from merlokk/json_loclass
`hf mf csave` and `hf mf cload` works with json.
2018-11-29 16:50:27 +01:00
merlokk
4dece3e30d del line 2018-11-29 17:13:00 +02:00
merlokk
efabdde248 small fixes. done 2018-11-29 17:09:37 +02:00
merlokk
6baf579fe0 hf mf cload works 2018-11-29 16:56:57 +02:00
merlokk
955ced6c28 hf mf csave works 2018-11-29 16:05:57 +02:00
merlokk
e6d7a05721 csave works 2018-11-29 13:42:07 +02:00
merlokk
0ffddd8470 raw load file 2018-11-29 13:21:38 +02:00
merlokk
5d5e273982 jansson update. 2.11 to 2.12
fix warnings
2018-11-29 12:00:23 +02:00
iceman1001
91809c6d94 FIX: part of https://github.com/Proxmark/proxmark3/pull/723 (@Fl0-0)
CHG: remove some warnings when compiling on 32/64 bit systems.  Messy messy
2018-11-28 23:53:31 +01:00
merlokk
21118ed6b8 Merge branch 'master' of github.com:merlokk/proxmark3i into json_loclass 2018-11-28 00:09:11 +02:00
merlokk
04b436ce5e del annoying comment 2018-11-27 19:44:03 +02:00