Commit graph

2957 commits

Author SHA1 Message Date
iceman1001 43d57855a0 CHG: wrong define 2019-01-11 12:56:59 +01:00
iceman1001 bd0e33fb58 chg: 'script run read_pwd_mem' - m|t|i params to simplify printing dictionary items 2019-01-10 18:55:56 +01:00
Oleg Moiseenko 7eb3e79d83
Merge pull request #81 from merlokk/emv_sdadda_fix
Emv sdadda fix
2019-01-10 17:27:29 +02:00
merlokk cada4e4877 DDA works 2019-01-10 17:24:45 +02:00
merlokk 607bef7ffd AC Response Format1 2019-01-10 16:22:32 +02:00
merlokk 70744d2cbb small fix 2019-01-10 13:26:15 +02:00
merlokk 8240639d73 fill VSDC with only AC1 2019-01-10 13:22:27 +02:00
merlokk 0ac728f0d4 VSDC path sketch 2019-01-10 13:06:56 +02:00
merlokk 56c0dad966 changes in cert decoding logic 2019-01-09 21:05:52 +02:00
merlokk 4921308d84 some changes in DDA 2019-01-09 21:03:56 +02:00
merlokk 20d29f35e5 SDA works 2019-01-09 19:32:08 +02:00
merlokk 506da60cad hash init 2019-01-09 18:47:26 +02:00
merlokk 88b2cf41de add description 2019-01-09 18:46:55 +02:00
iceman1001 e276bf1ce3 FIX: gcc8.1 warnings 2019-01-09 16:25:49 +01:00
merlokk 4a38ab7be4 small fix 2019-01-09 17:08:23 +02:00
merlokk 010492a87e input list build fixed 2019-01-09 17:04:21 +02:00
merlokk 4880316ab9 fix hash 2019-01-09 15:20:18 +02:00
iceman1001 96361abd97 FIX: supress gcc warnings like libjansson
https://github.com/akheron/jansson/pull/423/files
2019-01-09 12:28:56 +01:00
iceman1001 8f18a9abf2 CHG: tvl tag length adapted 2019-01-09 12:07:07 +01:00
iceman1001 d13541791b chg: tlvtag can be 4bytes.. 2019-01-08 20:20:16 +01:00
iceman1001 7bb8c629ba fix: remove warnings 2019-01-08 20:14:46 +01:00
RFID Research Group 4573f7b006
Merge pull request #80 from merlokk/emv_print_mode
emv commands now prints channel
2019-01-08 19:09:58 +01:00
merlokk 1fb7948623 emv commands now prints channel 2019-01-08 19:49:31 +02:00
merlokk ce6320cdc1 change sc apdu to be compatible with 14a apdu 2019-01-08 19:22:27 +02:00
iceman1001 11e0c09fdd CHG: more definitions 2019-01-08 16:48:04 +01:00
iceman1001 a17bf8e559 FIX: remove gcc8.2 warning 2019-01-08 11:20:42 +01:00
iceman1001 dac30911a3 FIX: remove gcc8.2 warnings 2019-01-08 10:56:56 +01:00
iceman1001 699a3b7152 FIX: remove overwriting warning 2019-01-08 02:23:06 +01:00
iceman1001 2d5d8c130d chg: 'hf list 14a' - another 7bit command 0x35 2019-01-08 02:22:41 +01:00
iceman1001 9b7089e71f FIX: remove warning of overwriting 2019-01-08 02:16:39 +01:00
Chris 5a34550ac5 CHG: printing 2019-01-07 17:49:09 +01:00
iceman1001 3ae871f534 CHG: 'hf 14a antifuzz' - original implementation by @asfabw, reworked a bit - WORK IN PROGRESS - 2019-01-07 09:32:16 +01:00
iceman1001 0dee369a58 FIX: 'hf tune' - now works... 2019-01-06 20:28:23 +01:00
iceman1001 806e5909a7 ADD: 'hf felica list' - updated annotation. 2019-01-06 19:41:29 +01:00
iceman1001 f99e6a5cae chg: remove warning 2019-01-06 19:19:30 +01:00
iceman1001 f08e471d2e Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2019-01-05 20:45:54 +01:00
iceman1001 f23219f3b8 FIX: printing percentage char is now standard compliant (@fabled)
see https://github.com/iceman1001/proxmark3/pull/272
2019-01-05 20:45:02 +01:00
merlokk a86c6fa1a8 get rid of math.h ) 2019-01-03 21:00:07 +02:00
merlokk b5c2ccb78f pse/ppse works 2019-01-03 20:07:08 +02:00
merlokk 00d4393af4 tlv_get_uint8 2019-01-03 19:43:01 +02:00
merlokk 723298d00c added new tlv function 2019-01-03 19:42:40 +02:00
merlokk a5f8454168 added pse sfi files get 2019-01-03 13:41:28 +02:00
merlokk 0da07fe81c get SFI records 2019-01-02 19:31:06 +02:00
iceman1001 e3f4ef498f CHG: 'hf mf fchk' - textual 2019-01-02 12:11:49 +01:00
iceman1001 6e281a08ed CHG: 'hf mf fchk' - speed improvments by tweaking implementation.
CHG: 'hf mf fchk' - can use dictionary from flashmem if one is uploaded. (faster)
2019-01-02 11:52:13 +01:00
iceman1001 0fb0c35308 CHG: 'mem load' - the possibility to upload default_iclass_keys.dic, default_keys.dic, default_pwd.dic to predefined flashmemory sections. These will be used in pwd / key checking algorithms on device.
CHG: 'script run read_pwd_mem.lua' - script now can print those uploaded dictionary files.

How to upload
pm3 --> mem load f default_iclass_keys i
pm3 --> mem load f default_keys m
pm3 --> mem load f default_pwd t

How to validate / view
PM3 -->scr run read_pwd_mem -o 237568 -k 8
pm3 -->scr run read_pwd_mem -o 241664 -k 6
pm3 -->scr run read_pwd_mem -o 245760 -k 4
2019-01-01 18:01:40 +01:00
Chris 75d0b0b06f CHG: 'emv roca' - added selftest and textual layouts'
DEL: removed unused old emv files
2019-01-01 10:53:41 +01:00
Chris 0ddda8998e chg: added info 2019-01-01 10:15:27 +01:00
iceman1001 9e07a5c65a CHG: updated to RevEng v1.6.0 2018-12-31 15:46:32 +01:00
merlokk 690a8e604a updated licanse according to changes https://gist.github.com/robstradling/f525d423c79690b72e650e2ad38a161d#file-roca-c-L138 2018-12-29 00:31:10 +02:00
merlokk 3926874995 fix pse channels 2018-12-28 20:48:45 +02:00
merlokk 376ead028a added tests 2018-12-28 20:33:38 +02:00
merlokk 7401d51ebf roca works 2018-12-28 20:33:24 +02:00
merlokk e315328625 works 2018-12-28 20:06:18 +02:00
merlokk 44343d806f add some debug 2018-12-28 19:25:19 +02:00
merlokk 05814fbe75 added mpi print 2018-12-28 19:06:51 +02:00
merlokk f1cd108b1a move g_one to cycle 2018-12-28 18:09:20 +02:00
merlokk 5eafc491ec small add 2018-12-28 18:00:37 +02:00
merlokk 404f23ddbd small fix 2018-12-28 17:50:51 +02:00
merlokk 18225c7c7f some fix 2018-12-28 17:48:52 +02:00
merlokk 6afda099db added test/ not works 2018-12-28 17:46:57 +02:00
merlokk 625b696291 roca works 2018-12-28 17:25:11 +02:00
merlokk 67b7edeb44 extract keys works 2018-12-28 17:07:58 +02:00
merlokk b0c1828c1d load params 2018-12-28 16:58:11 +02:00
merlokk 8e5133582d emv roca select app 2018-12-28 16:43:15 +02:00
merlokk ab41b4a991 emv_rocacheck 2018-12-28 16:40:53 +02:00
merlokk 9804526dca small fix for unsigned int 2018-12-28 14:52:24 +02:00
merlokk b1145ba577 mpi_get_uint 2018-12-28 14:50:23 +02:00
merlokk 88d42a1af5 make 2018-12-28 13:46:52 +02:00
iceman1001 92fadc2a9f ADD: 'amiitool' - Added @socram8888 's great tool for manipulating amiibo tags. The idea is to build it in the pm3 client. It compiles as is, but the hookup in client is not done. *WORK IN PROGRESS* 2018-12-27 19:45:53 +01:00
Chris c6089d7fdb chg: more definitions 2018-12-26 17:54:29 +01:00
Chris ed68068107 chg: 'emv roca' -now compiles 2018-12-26 12:50:11 +01:00
Chris 33f6439d38 add 'emv roca' - new command, will be able to test for ROCA 2018-12-26 11:02:00 +01:00
Chris ab9048f7c5 CHG: 'sc brute' loop 31, 255 2018-12-25 18:18:48 +01:00
Chris ddfe584582 CHG: 'sc brute' - nicer output, rearrange code 2018-12-25 18:16:47 +01:00
Chris 5140db2ac6 CHG: some more descriptions 2018-12-25 18:13:41 +01:00
iceman1001 acb41a7376 CHG: 'sc brute' - now is interruptable, optional tlv decode, 2018-12-23 09:48:46 +01:00
Oleg Moiseenko a47fa470c1
Merge branch 'master' into atrzerocheck 2018-12-20 23:07:30 +02:00
merlokk d64a48b7fc added check Fi and Di 2018-12-20 23:05:02 +02:00
iceman1001 ddb4fc33c9 CHG: 'sc info' - textual 2018-12-19 23:46:19 +01:00
iceman1001 a9b3fd7138 chg: 'sc brute' - now works :) 2018-12-19 23:21:59 +01:00
iceman1001 0143d3f0e0 chg: 'sc raw' - some more love 2018-12-19 22:50:32 +01:00
merlokk f0c3482799 add T=0 to sc raw command 2018-12-19 20:31:20 +02:00
iceman1001 e567b74fa0 chg... 2018-12-19 08:57:59 +01:00
iceman1001 94e0d43502 CHG: coloring of ERR 2018-12-18 18:43:49 +01:00
iceman1001 4ef59c3771 CHG: uniform output. 2018-12-18 18:43:27 +01:00
Iceman c0b72bb95c
Merge pull request #72 from merlokk/le_fix
fix sending Le over 7816 T=0
2018-12-18 18:03:10 +01:00
iceman1001 60b7dbe525 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2018-12-18 17:57:56 +01:00
iceman1001 5489d4e552 add: magic uid 15 helper script
chg:  keys
2018-12-18 17:57:22 +01:00
merlokk b42709837f fix sending Le over 7816 T=0 2018-12-18 18:55:46 +02:00
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