RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-22 16:26:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
11671 commits 3 branches 14 tags 86 MiB
Commit graph

2735 commits

Author SHA1 Message Date
iceman1001 52164a4fd1 hf 14b sriread -> hf 14b rdbl, renamed and refactored it to read a block. use dump, to dump whole tag 2020-10-27 18:26:14 +01:00
tharexde ce5181bdc9 added std_read command for em4x50 2020-10-27 18:18:02 +01:00
tharexde e63a40e5b6 added file upload for sim function 2020-10-27 00:53:50 +01:00
tharexde d6471f2231 Merge branch 'master' into allin 
update
 2020-10-26 22:20:32 +01:00
tharexde d034d640fc added simple sim functionality for em4x50 (+ some minor corrections) 2020-10-26 22:13:07 +01:00
tharexde 96e05d49df added simple sim function for em4x50 2020-10-26 22:10:48 +01:00
iceman1001 57f226c922 smart upgrade - now uses NG, added crc for each transfer to verify data integrity before flashing 2020-10-26 00:38:13 +01:00
tharexde 3ce365ee2b Merge branch 'master' into allin 
update
 2020-10-26 00:31:27 +01:00
tharexde b3b6f827e8 no comment necessary 2020-10-26 00:12:52 +01:00
tharexde 0b034321ac added new function 4x50_restore 2020-10-25 16:40:39 +01:00
tharexde ea5fc5cc46 added new function 4x50_restore 2020-10-25 16:40:02 +01:00
tharexde 4c6651b3c8 added new function 4x50_restore 2020-10-25 16:39:40 +01:00
Philippe Teuwen 4ff8c44d85 Add warning if using 14a Transmit without setting HF field 2020-10-25 11:23:56 +01:00
iceman1001 bc48941951 fix smart card 2020-10-25 01:12:20 +02:00
Philippe Teuwen 21bc3b8822 typos 2020-10-24 01:18:51 +02:00
iceman1001 34148b0383 fix https://github.com/RfidResearchGroup/proxmark3/issues/1029 2020-10-23 10:00:47 +02:00
tharexde 243e6934de added "tearoff" 2020-10-22 15:07:05 +02:00
tharexde 069018e72a Merge branch 'master' into allin 
update
 2020-10-22 01:01:59 +02:00
tharexde d6b90bbe6b deleted debug output 2020-10-22 00:55:29 +02:00
tharexde a04002ab1b redesign 2020-10-22 00:42:18 +02:00
Philippe Teuwen 50c0d93951 Change EM4x05 reader timings 
Closer to the spec and better results, more robust to tag position
 2020-10-20 23:49:26 +02:00
Philippe Teuwen 47cfc778e3 typos 2020-10-20 20:22:54 +02:00
iceman1001 d8294a958b hf 14a antifuzz - now uses NG 2020-10-20 17:36:01 +02:00
iceman1001 2e27a493e8 revert to precision clock 2020-10-20 17:34:42 +02:00
Philippe Teuwen a6beff18a5 fix em 4x05 bf 2020-10-20 15:46:44 +02:00
Philippe Teuwen 3b83e8e703 EM 4x05 login bf 2020-10-20 13:21:40 +02:00
Philippe Teuwen 29f1147aad make style 2020-10-20 01:00:23 +02:00
Philippe Teuwen ae1b4b62b6 EM4x05 login & read: don't use threshold for acquisition 2020-10-19 00:52:21 +02:00
Philippe Teuwen a8ca19bec5 EM 4x05: acquire more samples for Login 2020-10-19 00:15:01 +02:00
Philippe Teuwen 95bf65cda9 Add EM 4x05 Login 2020-10-18 23:46:36 +02:00
iceman1001 63603cc422 fix coverity 2020-10-16 17:13:14 +02:00
tharexde a84074686b removed global structure/variable for saving tag information 2020-10-14 20:01:15 +02:00
iceman1001 53c7e47e75 fix: hf iclass restore - now uses NG and better reporting and works :) 2020-10-14 17:41:34 +02:00
iceman1001 3868b0b4e6 hf iclass write, hf 15 raw, write, etc supports tear off trigger 2020-10-13 22:43:28 +02:00
iceman1001 6e6c8cbd6b hf 14b raw - added tearoff 2020-10-13 16:09:17 +02:00
iceman1001 d8b2dc2ebf enable tearoff for LF EM 4x50_WRITE & EM_WRITE_PASSWORD 2020-10-13 14:00:03 +02:00
iceman1001 597e069c50 remove HF ICLASS REPLAY, use HF ICLASS RDBL or HF ICLASS DUMP instead with option "n" 2020-10-13 11:54:38 +02:00
Philippe Teuwen a575827c99 add tearoff to hf 14a raw 2020-10-12 21:40:47 +02:00
iceman1001 7cfbdcbae9 WIP - hf mfu countertear ... 2020-10-12 19:08:29 +02:00
Philippe Teuwen 55fa5e7c35 make style 2020-10-11 22:40:05 +02:00
tharexde b4a8409349 clean up 2020-10-11 20:06:03 +02:00
iceman1001 bc9545d493 hf mfu otptear - textual, changing order on initial write device 2020-10-11 18:03:29 +02:00
iceman1001 863eaf1c8f fix 2020-10-11 11:20:07 +02:00
iceman1001 43f4bba432 hf mfu otptear - use high precision clock instead 2020-10-11 10:59:57 +02:00
iceman1001 ec679385b9 hf mfu otptear - textual 2020-10-11 09:51:56 +02:00
Philippe Teuwen 07023657f2 generic tearoff: make use of new @iceman SpinDelayUsPrecision :) 2020-10-09 14:55:17 +02:00
iceman1001 0c54d13c47 added a precision timer ( 0.6ns for 43ms) 2020-10-09 14:30:34 +02:00
Philippe Teuwen 7f8a4b4182 Add generic tear-off hook 2020-10-09 01:52:56 +02:00
iceman1001 f3a3a94fea hf 14a config - text / colours 2020-10-08 22:11:29 +02:00
iceman1001 9162a9d5f0 lf hic clone - now use cliparse and support FC,CN and RAW 2020-10-08 20:26:46 +02:00
Philippe Teuwen f4feaa6a03 EM4x05: capture tag 'error preamble' answer as well 2020-10-07 22:55:43 +02:00
Philippe Teuwen 9962b8769a EM4x05: add support for Protect command 2020-10-07 18:38:47 +02:00
Philippe Teuwen 491adacb94 get rid of tabs 2020-10-06 20:45:13 +02:00
Philippe Teuwen 3f9ddf9b29 make style 2020-10-06 18:41:15 +02:00
tcprst fbc7f05ad1
rebase on master, fix merge conflict 2020-10-06 09:33:02 -04:00
Philippe Teuwen f43ad0a239 HF_YOUNG: turn leds off when quitting mode 2020-10-06 01:26:36 +02:00
Philippe Teuwen 1610bf7e23 HF_YOUNG: HF field off and sleep between polls 2020-10-06 01:26:14 +02:00
Philippe Teuwen b081684f22 HF_MATTYRUN: turn leds off when quitting mode 2020-10-06 01:17:40 +02:00
Philippe Teuwen cdd39f3ac3 HF_COLIN: HF field off and sleep between polls 2020-10-06 01:05:26 +02:00
Philippe Teuwen 6540b4561c HF_AVEFUL: allow to exit mode with long press 2020-10-06 00:52:11 +02:00
Philippe Teuwen 7b599c7f67 HF_AVEFUL: HF field off and sleep between polls 2020-10-06 00:51:52 +02:00
Philippe Teuwen fb90c078ff HF_MFSDSAL: turn HF field off 2020-10-06 00:38:30 +02:00
tharexde 68db54028c added function 4x50_watch 2020-10-05 22:59:08 +02:00
iceman1001 ad20dcb30a 14a - less wake up wait 2020-10-05 10:03:19 +02:00
iceman1001 8baeaa58e2 14b -add option for cleatrace, empty card struct, and adapt the padding of bits 2020-10-05 10:02:32 +02:00
iceman1001 77f4371cd1 plot 2020-10-04 19:39:22 +02:00
iceman1001 dd970ea562 text 2020-10-04 02:09:58 +02:00
tharexde b0cfb28d40 Merge branch 'master' into allin 
update
 2020-10-03 23:34:23 +02:00
tharexde a9ec622d97 added standalone mode "brute force" 2020-10-03 22:59:21 +02:00
Philippe Teuwen e5f746e018 fix 14b apdu 2020-10-03 19:08:34 +02:00
iceman1001 01af87e6d7 hf 14b sniff, sim, info, - now uses cliparser 2020-10-02 18:06:21 +02:00
iceman1001 31f5502171 remade ASK C-ticket select to deviceside 2020-10-02 14:31:52 +02:00
Philippe Teuwen b1c1433e45 14b: safer handling of corrupted signals 2020-10-02 00:58:41 +02:00
Philippe Teuwen f56cbc82f5 Add support for 14b' aka Innovatron in armsrc/iso14443b.c 2020-10-01 23:26:55 +02:00
iceman1001 5e91f35cd6 make sure tosend is not contain spurious bits from before 2020-10-01 00:37:37 +02:00
iceman1001 9e05faabff unify buffers 2020-09-30 19:20:40 +02:00
iceman1001 f221d127a1 wrong flag 2020-09-30 18:19:51 +02:00
iceman1001 181bb3bc74 added: hf 14b apdu 2020-09-30 17:06:19 +02:00
Philippe Teuwen c3c59e35cb make style 2020-09-30 14:27:19 +02:00
iceman1001 566d6dc4b7 boundry check for tosend buffer 2020-09-28 17:46:12 +02:00
iceman1001 c8aee45aca adapt hitag2 write 2020-09-28 15:44:44 +02:00
iceman1001 64c13c3aa1 style 2020-09-28 08:23:49 +02:00
tharexde c20ab4ca20 added function reset 2020-09-27 23:39:04 +02:00
tharexde 2e5cf12d7d added login function 2020-09-27 23:22:51 +02:00
tharexde ab8b5814b0 Merge branch 'dev-bruteforce_em4x50' into allin 
merge
 2020-09-27 19:55:42 +02:00
tharexde 037234bbbe Merge branch 'master' into dev-bruteforce_em4x50 
update
 2020-09-27 15:03:27 +02:00
tharexde 2dee47fe28 Merge branch 'master' into allin 
update
 2020-09-27 15:02:51 +02:00
tharexde c2d3b89325 very small corrections 2020-09-27 14:59:53 +02:00
tharexde fc3638a5f4 changed function name 2020-09-27 13:42:27 +02:00
tharexde ab5e4405fe changed function name + column order (output "lsb"/msb") 2020-09-27 13:42:13 +02:00
tharexde 2308cc7175 new entry for function em4x50_bruteforce 2020-09-27 12:59:04 +02:00
tharexde 38f88c1e4f new function 4x50_bruteforce 2020-09-27 12:55:59 +02:00
tharexde 1e75ddfff8 new entry for function 4x50_bruteforce 2020-09-27 12:54:54 +02:00
iceman1001 b4728157fb fix return codes for 14b, sorting out status checks in client 2020-09-26 09:33:36 +02:00
tharexde 5665de56e9 styling 2020-09-23 23:45:43 +02:00
tharexde 45a1a83752 make style 2020-09-23 23:44:42 +02:00
tharexde 59483e8c3b Merge branch 'master' into allin 
update 23.9.2020
 2020-09-23 23:20:18 +02:00
tharexde eaefd78c64 corrected stupid error (&->&&) 2020-09-23 23:16:39 +02:00
tharexde 7b62035bc4 adopted log file name, renamed functions 2020-09-23 23:09:12 +02:00
tharexde a7a86edf51 deleted inactive parts, corrected timeout handling 2020-09-23 23:08:24 +02:00
tharexde 252b8236cf renamed function names 2020-09-23 23:06:12 +02:00
Philippe Teuwen 7d4c6e8faa Fix Gen3 detection bug against MFUL 2020-09-23 12:25:30 +02:00
Philippe Teuwen 3909053cee Rename data_readpwdmem.lua -> mem_readpwd.lua and data_readpwdmem-spiffs.lua -> mem_spiffs_readpwd.lua 2020-09-23 00:46:57 +02:00
tharexde 72ab7177ae removed double declaration of variable "sample" 2020-09-23 00:12:57 +02:00
Philippe Teuwen 610b456a97 fix lau scripts renaming 2020-09-23 00:11:11 +02:00
tharexde 51651a1e0a Merge branch 'dev_standalone' into malsehn_standalone 2020-09-23 00:07:34 +02:00
tharexde b96b92249f div errors 2020-09-22 23:55:46 +02:00
tharexde 48495bf272 added missing "endif" 2020-09-22 23:34:23 +02:00
tharexde 732d903b52 simulate/read 2020-09-22 23:31:11 +02:00
Philippe Teuwen 1e19a7216a Avoid first spurious samples in LF sniff modes, prevents false triggering 2020-09-20 12:59:30 +02:00
Philippe Teuwen 35e276f8ed Add options to 'lf sniff' for repeated acquisitions 2020-09-20 11:37:51 +02:00
Ave fe22eafcf1
hf_aveful: Pull proper counter and tearing, bugfixes 2020-09-20 02:07:21 +03:00
Ave 4cd1c512b9
hf_aveful: Add Ultralight EV1 support, clean code, dynamically determine 
block size
 2020-09-20 01:00:57 +03:00
iceman1001 a32fbd21bd redundant declaration 2020-09-18 19:51:20 +02:00
Philippe Teuwen 426c08e221 ht2: avoid sending spurious command after command is finished 2020-09-18 17:04:54 +02:00
Philippe Teuwen 59976aa588 fix ht2 initial command timing 2020-09-18 17:04:54 +02:00
iceman1001 cedfea8149 continue testing next sector 2020-09-18 12:07:34 +02:00
iceman1001 8f2b9b9d66 less field timeup before first transmit 2020-09-17 22:17:16 +02:00
Philippe Teuwen 8dd803cd6b hitag: avoid warning about unaligned pointer in packed struct 2020-09-17 19:40:56 +02:00
Philippe Teuwen 4ec7bca270 Add option to define extra symbols for 'lf cmdread', required e.g. for Hitag Micro and for talking to HT2 in emulation mode 2020-09-17 17:18:14 +02:00
Philippe Teuwen c994323105 Unify 'lf read' and 'lf cmdread options', add options to cmdread 2020-09-16 12:59:42 +02:00
iceman1001 edebf17be5 keep WDT happy 2020-09-15 17:26:24 +02:00
Philippe Teuwen 172f3163e6 update magic cards doc 2020-09-13 15:19:35 +02:00
Philippe Teuwen 812d9cc46a style 2020-09-12 00:31:17 +02:00
Philippe Teuwen ecbcba18dd identify gen3 2020-09-11 18:17:58 +02:00
iceman1001 5b695153b6 improved staticnonce tristate processing 2020-09-11 16:15:58 +02:00
Philippe Teuwen e488ef306c Fix MFC static nonce detection on some cards and do it before prng det 2020-09-11 14:09:38 +02:00
Philippe Teuwen 55e800e4ce text 2020-09-11 13:36:57 +02:00
iceman1001 866f4b6313 hf 14a info - ntag21x identification 2020-09-10 20:40:12 +02:00
iceman1001 5689546ae0 fix super 2020-09-10 01:40:50 +02:00
iceman1001 eb353056dc fix super 2020-09-10 01:34:29 +02:00
iceman1001 9ced99a853 cident super card 2020-09-10 01:31:54 +02:00
iceman1001 2514ec740c uid 7 or 4 for desfire 2020-09-10 00:33:46 +02:00
iceman1001 014a3a4998 desfire supports 7 and 4 bytes 2020-09-10 00:24:56 +02:00
iceman1001 420b29c7bf hf 14a sim t 10 - possibility to simulate IKEA rothult locks 2020-09-10 00:05:50 +02:00
Philippe Teuwen 9778b272a8 Add ATS of NTAG Gen2 2020-09-09 02:01:36 +02:00
Philippe Teuwen 9f33e52ae0 Add ATS of other MFUL Gen2 2020-09-09 01:16:29 +02:00
Philippe Teuwen 22938f15dd Add ATS of other MFUL Gen2 2020-09-09 01:09:44 +02:00
Iceman 2990dba14f
Merge pull request #949 from aveao/mfucompatwrite 
Introduce compatible write support to hf mfu wrbl
 2020-09-08 23:27:41 +02:00
Eloff 589b0142e0 Fix: magic gen 3 card response check 2020-09-08 23:01:39 +03:00
Ave c06e5d0ac7
Remove old commented MifareUWriteBlockCompat 2020-09-07 22:44:01 +03:00
Ave f1146d360f
Introduce compatible write support to hf mfu wrbl 2020-09-07 22:34:44 +03:00
Philippe Teuwen a06f1c8858 hf mf eclr: cleaner end cond, even if it doesn't change behavior 2020-09-07 15:43:34 +02:00
Philippe Teuwen 974e9d8bb1 Fix hf mf eclr trailer sectors on 4K 2020-09-07 15:37:19 +02:00
Philippe Teuwen e3b8e868ea hf 14a config: force RATS 2020-09-07 15:09:24 +02:00
iceman1001 5d357a6039 style 2020-09-07 10:39:15 +02:00
iceman1001 0be35a8e7e style 2020-09-07 10:35:09 +02:00
Philippe Teuwen 2fc36d73c9 hf 14a config: better options 2020-09-07 10:24:12 +02:00
iceman1001 289f1c234c make sure magic wipe cmd gets 2000ms timeout 2020-09-07 10:21:29 +02:00
Philippe Teuwen b751354ea2 hf 14a: add config loopholes to deal with badly configured cards: invalid ATQA, invalid BCC, invalid SAK 2020-09-07 00:50:27 +02:00