Commit graph

8248 commits

Author SHA1 Message Date
iceman1001 c279c5e643 old to mix 2021-05-05 21:37:32 +02:00
iceman1001 e4f55556ba style 2021-05-05 21:04:48 +02:00
iceman1001 0dd73df088 hf mf wipe - now support enforcing sector 0 / block 0 writes 2021-05-05 19:33:15 +02:00
iceman1001 ea416c3694 fixing textual output of ASN1 printing 2021-05-05 12:07:36 +02:00
iceman1001 e6e58227cb text 2021-05-05 12:06:20 +02:00
iceman1001 967550d828 fix compiler warnings 2021-05-05 12:05:56 +02:00
iceman1001 6630f3724b asn1 decoder got some colors 2021-05-04 16:45:50 +02:00
iceman1001 9028c05539 style 2021-05-04 16:45:25 +02:00
iceman1001 997cd7577f added 'data asn1' - decodes asn1 byte arrays 2021-05-04 15:59:21 +02:00
iceman1001 8b100bf173 ..break it... 2021-05-04 09:46:58 +02:00
iceman1001 6d71b9327e ISO15693 SLIX modifications found in @g3gg0 's offical pm3 fork, looks like WIP, with more focus on a standalone mode. I took the base fcts 2021-05-04 09:40:30 +02:00
iceman1001 e14ef1abe4 add old lua script for identify t55xx json dump files 2021-05-03 22:14:09 +02:00
iceman1001 9533671616 hf iclass chk, lookup - solving some concurrensy issues 2021-05-03 20:33:51 +02:00
iceman1001 cd9090b6c8 hf iclass chk - now uses NG 2021-05-03 20:01:12 +02:00
iceman1001 305903c513 rework ISO15693 defines, removing duplicates 2021-05-03 09:35:38 +02:00
iceman1001 49ec0b4040 maur default.. DT 2021-05-03 09:32:18 +02:00
iceman1001 80817cea00 hf iclass chk - rework OLD -> NG. And textual 2021-05-03 09:31:51 +02:00
iceman1001 f50691e3de hf iclass eload - now uses NG 2021-05-02 18:41:43 +02:00
iceman1001 afa3093482 DT default pwd 2021-05-02 06:54:57 +02:00
iceman1001 788876538d convert from OLD to NG 2021-05-01 19:01:15 +02:00
iceman1001 1cc9d9e988 add parity check to N10002 2021-04-30 11:21:40 +02:00
iceman1001 bff70c09ea style 2021-04-30 11:20:03 +02:00
iceman1001 2aec706328 fix: memory leak when reconnecting to device, reuse old struct 2021-04-30 11:19:27 +02:00
iceman1001 0d1f8ca957 making a 14a select fct reachable, in order to do a test in desfire code without repeating same ftc 2021-04-30 11:18:14 +02:00
iceman1001 8243ac9749 fix a sanity memory leak with reserving memory used only for json file loading.. 2021-04-30 11:16:57 +02:00
iceman1001 550fa5aa8f 14a exchange apdu now uses defined return codes 2021-04-30 08:51:38 +02:00
iceman1001 3c072721bf trace list -t mfdes - updated EV2, EV3 annotations 2021-04-30 08:14:11 +02:00
Anže Jenšterle 5093e7357e
Update aid_desfire.json 2021-04-29 18:58:16 +02:00
iceman1001 79bf10dc30 text 2021-04-27 19:35:52 +02:00
iceman1001 82e71d7815 lf hid clone - only print the selected format 2021-04-27 19:16:06 +02:00
iceman1001 7b2adb1305 lf search - textual 2021-04-27 15:20:04 +02:00
iceman1001 10c9ea5f84 more wiegand formats, and if binary is user supplied use that length, and ignore parity faults is removed since we wanna see all decodings anyway 2021-04-27 15:19:34 +02:00
iceman1001 bbdb2d7c95 hf iclass lookup - fix wrong arg order 2021-04-27 15:16:27 +02:00
iceman1001 63b9adbffb hf iclass decrypt - add the possibility to decode as block6 after a decryted block 2021-04-27 15:15:59 +02:00
iceman1001 792b59997e change hf legic dump, restore, to abort if xoring of data failed 2021-04-26 14:29:28 +02:00
Iceman 5cf6798b70
Merge pull request #1258 from aveao/emrtd
emrtd: Fix file reading and parsing
2021-04-26 11:41:57 +02:00
iceman1001 c3f1edf73a added indala26,27,27asc, 29 bit formats 2021-04-26 11:37:58 +02:00
Ave but on a massive iMac a20f3afad2 emrtd: Fix problem with certain reads being incorrect 2021-04-26 12:02:50 +03:00
Ave but on a massive iMac 20ca241816 emrtd: Fix bug with certain file reads 2021-04-26 11:04:33 +03:00
iceman1001 c1339a4473 added some 38bit formats 2021-04-26 08:54:43 +02:00
iceman1001 62d84dd734 text 2021-04-25 11:57:28 +02:00
iceman1001 08f567a227 added 'lf idteck sim' 2021-04-25 11:57:03 +02:00
iceman1001 cfc8332321 text 2021-04-25 10:55:39 +02:00
iceman1001 94fc054277 changed 'emv *' - to try 14b if 14a fails. <experimental> 2021-04-24 14:53:40 +02:00
iceman1001 96ae77caf8 changed - now is able to interrupt search with <enter> 2021-04-24 14:52:33 +02:00
iceman1001 71c64337e1 hf 14a raw - maintain the 512 byte usb package limit 2021-04-24 14:46:51 +02:00
iceman1001 d7c5f0cac2 text 2021-04-24 14:39:27 +02:00
Iceman d680f1b290
Merge pull request #1254 from mwalker33/Desfire-Change-Key
Update cmdhfmfdes.c
2021-04-24 07:04:18 +02:00
mwalker33 ae42c9445a Update cmdhfmfdes.c
Desfire changekey AES
Seems to work, but response validation fails.
2021-04-24 13:43:00 +10:00
iceman1001 2119c4e7bd hf 14b got some love 2021-04-23 22:25:58 +02:00
Iceman 96e9d0f5cd
Merge pull request #1253 from mwalker33/Desfire-Change-Key
Desfire change key
2021-04-23 07:06:22 +02:00
mwalker33 6780b852d4 Update cmdhfmfdes.c
Desfire DES/3DES change key works
2021-04-23 07:44:32 +10:00
iceman1001 cc3fcb0ec6 might fix coverity CID 305865 2021-04-21 19:20:12 +02:00
iceman1001 b267ee8ef5 convert 14b raw to use NG 2021-04-21 18:36:21 +02:00
Philippe Teuwen e1b922631d Display only exec basename in proxmark3 client help 2021-04-20 18:46:58 +02:00
Philippe Teuwen 95031e0b17 remove color in proxmark3 -h 2021-04-20 12:21:54 +02:00
Philippe Teuwen 27fe63d122 update cmakefile for android 2021-04-20 12:07:52 +02:00
Philippe Teuwen 623f809ffe update cmakefile for lib 2021-04-20 12:06:53 +02:00
iceman1001 8172c708c3 cppchecker and some renaming 2021-04-20 11:00:39 +02:00
Philippe Teuwen a7ad668f83 script run help 2021-04-20 10:50:24 +02:00
Philippe Teuwen 7fbe4063b2 fix for script run & cliparser 2021-04-20 10:24:52 +02:00
Philippe Teuwen 06d61cdb7f fix script run for now, to be seen if we can do better 2021-04-20 01:41:34 +02:00
iceman1001 99a82cf7d2 coverity fixes 2021-04-19 23:31:11 +02:00
iceman1001 bb9cf8ec40 make sure there is room for null terminator 2021-04-19 23:25:13 +02:00
Philippe Teuwen a2fa5cbc44 Add fulltext test 2021-04-19 23:12:27 +02:00
iceman1001 c7e47a721d cliparser doesnt like empty strings, 2021-04-19 23:00:02 +02:00
iceman1001 1871e7b9fb lf t55xx resetread - correct cli arguments 2021-04-19 22:52:40 +02:00
iceman1001 150579f375 cliparser doesnt liek empty strings, should be NULL instead 2021-04-19 22:47:20 +02:00
iceman1001 5604afce7a trace list - now colors whole reader line output. Also little nasty buff-underflow bug fixed 2021-04-19 22:18:37 +02:00
Philippe Teuwen 1d69cabd54 change fido/emrtd/st fct names to match other functions 2021-04-19 21:56:49 +02:00
Philippe Teuwen dc54dd305b Use CmdTraceListAlias everywhere 2021-04-19 21:43:32 +02:00
Philippe Teuwen 2e925d5da3 hf 14a list & CmdTraceListAlias: simplify 2021-04-19 21:21:47 +02:00
Philippe Teuwen 4dea429157 hf 14a list helptext handling by CmdTraceListAlias, to be generalized if ok 2021-04-19 14:35:09 +02:00
Philippe Teuwen 4c228b6c64 fix handling of trace list -1 with empty trace buffer 2021-04-19 14:22:15 +02:00
iceman1001 baf6ef292d remove old unused files 2021-04-19 07:07:40 +02:00
Iceman 1468368f31
Merge pull request #1251 from tcprst/master
Fix Makefile for QT5 on macOS
2021-04-19 06:44:51 +02:00
Philippe Teuwen 008a0b5ab4 First attempt at dumping all help: proxmark3 --fulltext 2021-04-19 02:54:16 +02:00
tcprst 74d121a727
Fix Makefile for QT5 on macOS 2021-04-18 20:12:28 -04:00
Philippe Teuwen 11c7ead732 Add -h/--help support to last commands 2021-04-19 01:43:26 +02:00
Philippe Teuwen d2246e6606 remove leftover 2021-04-19 01:18:12 +02:00
Philippe Teuwen e2cc02af49 Allow to see help from all categories 2021-04-19 01:16:39 +02:00
Philippe Teuwen 7e68064446 Allow to see help offline 2021-04-19 00:33:59 +02:00
Philippe Teuwen 68e8705278 Add option -c to lf search to continue searching after first hit 2021-04-18 23:23:48 +02:00
iceman1001 f76528eba4 fix coverity CID 319477 2021-04-18 20:19:49 +02:00
iceman1001 e7df423e0f text 2021-04-18 20:03:23 +02:00
iceman1001 6961611474 unified text and loading file now follow new pattern 2021-04-18 19:57:50 +02:00
Philippe Teuwen 79bf006419 Makefile: remove ROOT_DIR 2021-04-18 18:52:48 +02:00
Philippe Teuwen ed78bca62b style 2021-04-18 18:31:51 +02:00
iceman1001 729fd0439c text 2021-04-18 16:05:45 +02:00
iceman1001 e28f8c5c65 fix config cards generation and it uploads direct to device. 2021-04-18 15:07:56 +02:00
iceman1001 155443754b better detection of empty blocks 2021-04-18 11:35:38 +02:00
iceman1001 d1507bd4c0 fix lua script - hf_mf_autopwn 2021-04-18 09:18:42 +02:00
Philippe Teuwen 4c696885e4 typos 2021-04-17 23:18:13 +02:00
iceman1001 3577193303 data raw - now use cliparser 2021-04-17 21:47:29 +02:00
Ryan Saridar 8046f6862a
Fix DESFire mis-annotation 2021-04-17 19:08:34 +01:00
iceman1001 ec9c9a54ab clang fix 2021-04-17 15:42:58 +02:00
iceman1001 0c78958122 clang fix 2021-04-17 15:36:46 +02:00
iceman1001 a1ddd01906 clang 2021-04-17 15:28:49 +02:00
iceman1001 2b8d5e5c0d clang fixes 2021-04-17 15:23:19 +02:00
iceman1001 be6a9273ec clang fix 2021-04-17 15:17:39 +02:00
iceman1001 cd965a6d34 fix coverity CID 93584 2021-04-17 10:38:41 +02:00
iceman1001 5a847b2629 lf pac demod - now also checks for inverted bitstream 2021-04-16 21:35:14 +02:00
iceman1001 d34ae56c11 style 2021-04-16 17:10:45 +02:00
iceman1001 d2646122e7 style 2021-04-16 17:10:08 +02:00
iceman1001 5775a283e9 fix coverity CID 319296 2021-04-16 17:04:21 +02:00
iceman1001 8497b3e3f6 fix data dec 2021-04-16 13:20:20 +02:00
iceman1001 cf8f0f0b6a hf iclass eload/view/decrypt - now suports BIN/EML/JSON formats 2021-04-16 12:53:44 +02:00
iceman1001 dff76e81ca fix coverity CID 226452, 319217 2021-04-16 08:43:20 +02:00
iceman1001 72e5b9e80d text 2021-04-16 08:09:11 +02:00
Philippe Teuwen e62dfa3bcd typos 2021-04-16 01:53:07 +02:00
iceman1001 4f21963b07 text 2021-04-16 01:29:47 +02:00
iceman1001 f1cf01f757 test 2021-04-16 01:15:14 +02:00
iceman1001 086cea765f text 2021-04-16 01:08:25 +02:00
iceman1001 8f3f868e81 text 2021-04-16 01:03:34 +02:00
iceman1001 4c8aada66b text and rework 2021-04-16 00:44:50 +02:00
iceman1001 44edec6fcd Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2021-04-16 00:25:38 +02:00
iceman1001 c2a6d6fc42 text 2021-04-16 00:23:17 +02:00
iceman1001 83339d0a45 text 2021-04-16 00:15:43 +02:00
iceman1001 568d7cc1d4 this script suffers much. its not designed to use --paramss in the calls to the pm3 client 2021-04-16 00:13:44 +02:00
Philippe Teuwen f63125386b typos 2021-04-16 00:13:36 +02:00
Philippe Teuwen 046f8f50ea typo 2021-04-16 00:09:11 +02:00
iceman1001 e426699c5d forgotten 2021-04-16 00:00:02 +02:00
iceman1001 53b42d0069 adapt text 2021-04-15 23:39:33 +02:00
iceman1001 876de0d954 rework helptexts and params 2021-04-15 23:26:31 +02:00
iceman1001 771ac8d239 text 2021-04-15 23:00:43 +02:00
iceman1001 34544e238e text 2021-04-15 22:58:16 +02:00
iceman1001 4e417fe037 fix commands 2021-04-15 22:49:39 +02:00
iceman1001 62697ca460 text 2021-04-15 22:41:47 +02:00
Iceman 0a88565d0f
Merge pull request #1248 from merlokk/emv_crypto
show some general crypto description
2021-04-15 22:08:21 +02:00
iceman1001 9c35896162 hf 14b reader - now supports continuous mode 2021-04-15 22:06:17 +02:00
iceman1001 786858aa6c fix ´hf search' / ´hf 15 reader´ looping gave false result 2021-04-15 21:51:47 +02:00
iceman1001 4f3447a4ab text 2021-04-15 19:34:42 +02:00
merlokk b627934fb4 fix tabs 2021-04-15 19:56:20 +03:00
merlokk e1a7b61b1f show some general crypto description 2021-04-15 19:51:24 +03:00
iceman1001 46bf529763 change 'hf 15 restore' now supports EML/JSON 2021-04-15 18:27:24 +02:00
iceman1001 8587b93e0d text 2021-04-15 18:11:44 +02:00
iceman1001 f5147cb5cf hf 15 raw - now uses cliparser 2021-04-15 18:11:22 +02:00
iceman1001 7a04b06f52 hf 15 restore - now uses cliparser 2021-04-15 17:37:35 +02:00
merlokk 966875ce6f add tokenization tags for apple/google pay 2021-04-15 18:05:08 +03:00
iceman1001 49630f0a7f hf 15 dump - now uses cliparser 2021-04-15 12:52:47 +02:00
iceman1001 d33ba25d3f hf 15 wrbl - now uses cliparser 2021-04-15 12:31:16 +02:00
iceman1001 3e1a1abbbb hf 15 info - now uses cliparser 2021-04-15 12:15:44 +02:00
iceman1001 0f9365d2dd hf 15 rdmulti - now colors lockbyte if set 2021-04-15 11:16:23 +02:00
iceman1001 9347426456 hf 15 rdmulti - now uses cliparser 2021-04-15 11:05:57 +02:00
iceman1001 f76f98b318 hf 15 rdbl - now uses cliparser 2021-04-15 10:54:40 +02:00
iceman1001 d5aee1bd00 text 2021-04-15 10:42:47 +02:00
iceman1001 9396aa4bf6 text 2021-04-15 10:40:23 +02:00
iceman1001 ab3032c628 hf 15 writeafi, writedsfi - now support cliparser 2021-04-15 10:39:56 +02:00
iceman1001 1ec1bda141 fix lf search 2021-04-14 14:24:50 +02:00
iceman1001 eb4181d8be reenabled felica in hf search 2021-04-14 08:15:30 +02:00
iceman1001 fc61561e97 hf felica auth1, auth2 - now use cliparser. 2021-04-14 08:15:14 +02:00
iceman1001 831f664a4c coverity fix CID 319217 2021-04-13 17:45:36 +02:00
iceman1001 967cab7b58 update the header file 2021-04-13 17:02:06 +02:00
iceman1001 e7e43d11d0 hf felica rdbl, wrbl, now uses cliparser. Renamed them, and hf felica raw got a bugfix to read raw bytes correct 2021-04-13 16:08:58 +02:00
iceman1001 30ea41efc8 hf felica scsvcode, rdunencrypted - now uses cliparser 2021-04-13 15:30:12 +02:00
iceman1001 506d660c29 cppchecker fixes 2021-04-13 11:08:03 +02:00
iceman1001 66a9490fe7 lf t55xx restore - now support bin/eml/json formats 2021-04-13 11:05:39 +02:00
iceman1001 536ddd17fd cppchecker fixes 2021-04-13 10:02:48 +02:00
iceman1001 4d2f8a3bd5 hf felica rqresponse - now uses cliparser 2021-04-12 22:49:19 +02:00
iceman1001 935ba8289a hf felica rqsyscode, rqspecver - now uses cliparser 2021-04-12 22:10:38 +02:00
iceman1001 cf0ffb778d hf felica rqservice - now uses cliparser 2021-04-12 21:42:49 +02:00
iceman1001 37751e1b2b hf felica resetmode - now uses cliparser 2021-04-12 21:30:53 +02:00
dandri 4f3991a10c
3-keys-added 2021-04-12 17:57:06 +00:00
iceman1001 6da7fcd510 coverity fixes 2021-04-12 18:39:15 +02:00
iceman1001 b7b42ebd39 lf hitag dump - now supports cliparser. Command is still not implemented 2021-04-12 16:47:54 +02:00
iceman1001 0290efb25e hf mf hardnest - init all values (Thanks @doegox) 2021-04-12 16:18:24 +02:00
iceman1001 5ddedf17dd lf hitag writer - now uses cliparser 2021-04-12 16:17:37 +02:00
iceman1001 8bee66c32a lf hitag reader - now uses cliparser 2021-04-12 13:18:25 +02:00
iceman1001 b59e469d47 hf mf autopwn - now use cliparser 2021-04-12 10:02:47 +02:00
iceman1001 e2ed63d96b hf mf hardnested - now uses cliparser 2021-04-12 08:16:11 +02:00
iceman1001 199e344260 use defines instead 2021-04-11 21:35:45 +02:00
iceman1001 f07426db43 hf mf restore - now uses cliparser 2021-04-11 21:19:14 +02:00
iceman1001 e5a9e8812a hf mf wrbl - now uses cliparser 2021-04-11 19:11:11 +02:00
iceman1001 96f8cad9a5 hf mf decrypt - now use cliparser 2021-04-11 18:18:13 +02:00
iceman1001 55e1b95f21 hf mf setmod - now uses cliparser 2021-04-11 17:54:17 +02:00
iceman1001 0ac28addcb remove one test command 2021-04-11 13:58:04 +02:00
iceman1001 cc5debd628 hf mf csetblk - now uses cliparser. plus print refactoring 2021-04-11 13:14:13 +02:00
iceman1001 e448d58291 hf mf csetuid - now supports cliparser. Also experimental 7byte support. Not seen one in the wild. untested 2021-04-11 12:48:06 +02:00
iceman1001 65427193d6 hf mf csave - now use cliparser\nhf mf view - now accepts BIN/EML/JSON 2021-04-11 11:30:09 +02:00
iceman1001 e4648ba1c3 hf mf eload / cload now takes BIN/EML/JSON files 2021-04-11 10:59:55 +02:00
iceman1001 e8d0a1e783 hf mf cview - now uses cliparser 2021-04-10 19:38:01 +02:00
iceman1001 99cb92e736 hf mf esave - now uses cliparser 2021-04-10 19:25:50 +02:00
iceman1001 93a9750d93 hf mf ecfill - now uses cliparser 2021-04-10 19:08:32 +02:00
iceman1001 5ac7b9fd9f hf mfu eload - now works again :) 2021-04-10 18:21:38 +02:00
iceman1001 43c42a06a0 hf mf eload - now uses cliparser, and fixes for block printing etc. 2021-04-10 18:13:11 +02:00
iceman1001 d551a66256 new command "hf mf view".\nhf mf eview - now uses cliparser 2021-04-10 15:40:25 +02:00
iceman1001 e1b856b5fc hf mf ekeyprn, eclr, nack - now uses cliparser 2021-04-10 15:08:27 +02:00
iceman1001 49b830266c text 2021-04-10 12:28:39 +02:00
iceman1001 1cb9b37d83 hf mf rdbl,rdsc - now use cliparser 2021-04-10 09:51:18 +02:00
iceman1001 a8a17b70d3 hf mf egetsc/egetblk/cgetsc/cgetsc - now use cliparser and can decode st 2021-04-10 09:01:00 +02:00
iceman1001 916e5d7ba2 versbose text 2021-04-10 08:05:33 +02:00
Ryan Saridar 2e09354bba
Fix RESTORE mis-annotation 2021-04-08 16:51:21 +01:00
merlokk 2f634923bb if SSAD present before check it (A@Pay) 2021-04-08 17:59:47 +03:00
merlokk a99a52f5a6 check CDA SDAD present 2021-04-08 17:58:25 +03:00
merlokk 7becdffd6d work with apple/google pay 2021-04-08 15:57:13 +03:00
iceman1001 007b916643 style 2021-04-08 11:08:39 +02:00
iceman1001 27184d7f5b style 2021-04-08 10:44:31 +02:00
iceman1001 31c5722ac0 fix coverity CID 317343,317344 ... 2021-04-08 10:38:10 +02:00
iceman1001 3e1b041ff8 fix coverity CID 317346 2021-04-08 10:37:33 +02:00
iceman1001 a731bccb01 inverse to please osx 2021-04-08 10:01:18 +02:00