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
12798 commits 3 branches 14 tags 86 MiB
Commit graph

7952 commits

Author SHA1 Message Date
iceman1001 aae08929dd text 2021-03-11 22:45:51 +01:00
iceman1001 c5c689f50f data fsktonrz - now uses cliparser 2021-03-11 09:26:02 +01:00
iceman1001 27dafa2bb0 marking of crc bytes overwrote first hex char 2021-03-10 14:08:33 +01:00
Philippe Teuwen 64a04498bd Add reader parity errors on MFC traces 2021-03-10 13:52:26 +01:00
Philippe Teuwen 3502fbd82b Fix lf em4x05 unlock 2021-03-10 12:08:22 +01:00
Philippe Teuwen d3a960717f text 2021-03-10 11:23:13 +01:00
iceman1001 1b2091932e fix 'mem spiffs view' and bad file stats retrieval 2021-03-10 10:43:49 +01:00
iceman1001 bf49f4432b rdsc/egetsc/cgetsc - output unified 2021-03-10 05:15:36 +01:00
iceman1001 92b627a0bd hf mf rdsc - modified output 2021-03-10 04:59:44 +01:00
iceman1001 102fa451db pref - now uses cliparser everywhere 2021-03-09 22:14:57 +01:00
iceman1001 590c7ff717 fix helptext 2021-03-09 22:02:08 +01:00
iceman1001 8dddb0b3bc mem dump - optional columns 2021-03-09 21:16:51 +01:00
iceman1001 a807c504c1 added ascii to the output 2021-03-09 21:08:24 +01:00
iceman1001 bcb83e01a9 text 2021-03-09 16:16:50 +01:00
iceman1001 ba79bb7b06 fix some missing command when printing helps/markdown 2021-03-09 16:09:36 +01:00
iceman1001 af6289c99a text 2021-03-09 14:38:53 +01:00
iceman1001 ad2b0879fc added: mem spiffs view - to view a file on SPIFFS\n mem spiffs dump - now uses cliparser and NG 2021-03-09 14:38:31 +01:00
iceman1001 02aabf90d3 mem spi mount/unmount/test/check/tree/info/remove/rename/wwipe - now uses cliparser. remove/rename uses NG 2021-03-08 17:39:21 +01:00
iceman1001 59379247e6 adapt text to t55xx 2021-03-08 11:31:40 +01:00
mwalker33 b01c269c70 Update cmdlft55xx.c 
Code clean and tweak
 2021-03-08 19:25:14 +11:00
mwalker33 0a3c05c02c Update cmdlft55xx.c 
fix toggle of ST INV and Q5/T55
fix lf t55xx brute for all downlink modes
fix lf t55xx chk -f <password file>
fix lf t55xx chk for all downlink modes
 2021-03-08 13:40:06 +11:00
iceman1001 0742241994 fix lf t55 config - bitrate and macros (thanks @mwalker33) 2021-03-08 00:47:11 +01:00
iceman1001 fd656541dd fix lf t55xx wipe - calling write with correct params 2021-03-08 00:28:38 +01:00
Philippe Teuwen f2a0f3e272 replace static countones & bitcount by utils in client 2021-03-07 23:48:55 +01:00
Philippe Teuwen e5c5629cf2 Some tunings of otptear: 
- make tearoff_delay_us and tearoff_enabled globals
- use tearoff_hook and remove Dbprintf in critical tearoff timing
- move initial write from MifareU_Otp_Tearoff to CmdHF14AMfuOtpTearoff and make it optional (old behavior was writing initial 00000000 when -d was not provided)
- tearoff: compare with initial write, not with previous tearoff outcome
- rephrase some messages
- track all begin and end of erase and write phases, with quite complex logic to cover multiple cases (starting in middle of erased phase, starting with write 0, ...) and report them
- check against initial write error
- repeat same timing (up to 10x) in case of write/read errors then quit
- typos
 2021-03-07 23:48:55 +01:00
iceman1001 55ccd18afd lf hitag cc - now uses cliparser 2021-03-07 22:27:37 +01:00
iceman1001 fe25e70e6f string too small fix 2021-03-07 22:24:37 +01:00
iceman1001 7377a45bd0 lf t55xx write - now uses cliparser 2021-03-07 22:00:33 +01:00
iceman1001 a3b42e27cf lf t55xx read - now uses cliparser 2021-03-07 20:24:13 +01:00
iceman1001 d93bcd4074 text 2021-03-07 19:04:14 +01:00
iceman1001 827c529aea lf t55 config - now uses cliparser... and texts 2021-03-07 18:56:37 +01:00
iceman1001 0067a9b7fa for commands with many params 2021-03-07 18:55:48 +01:00
iceman1001 964aee329f lf t55xx resetread - now uses cliparser 2021-03-07 15:08:38 +01:00
iceman1001 caf9e9cecc lf t55xx trace, info - now uses cliparser 2021-03-07 15:01:56 +01:00
iceman1001 450c7fab5b lf t55xx restore - now uses cliparser 2021-03-07 11:42:23 +01:00
iceman1001 d5ea600289 lf t55 dump - now uses cliparser 2021-03-07 11:25:17 +01:00
iceman1001 70bcfb7ffe textual, pushing a point 2021-03-07 10:44:21 +01:00
iceman1001 e4753011d8 text 2021-03-07 10:19:52 +01:00
iceman1001 14d62bf380 some lf reader used this configblock, dont remember if it was discussed on forum or discord 2021-03-07 08:58:16 +01:00
iceman1001 dff732840f mem info - now accepts input id to facility easy testing. Signature offset also triggers erase before to enable easy updates 2021-03-07 08:56:36 +01:00
iceman1001 17eefbcbb6 maur 2021-03-06 17:13:05 +01:00
Iceman e4b2a278db
Merge pull request #1217 from mwalker33/t55xx-works 
T55xx works
 2021-03-06 11:43:22 +01:00
mwalker33 6aa9b98afc Update cmdlft55xx.c 
T55xx detect
- set default to try all downlink modes
- ensured when trying all downlink modes it starts at fixed bit.
 2021-03-06 17:36:42 +11:00
iceman1001 547e462422 spelling 2021-03-05 12:55:28 +01:00
iceman1001 7416045747 demonstrate amiitool integration with mfu commands. 2021-03-05 10:23:51 +01:00
iceman1001 4c845fb859 endless happiness 2021-03-05 10:18:34 +01:00
iceman1001 3f300d917e maur 2021-03-05 10:15:22 +01:00
iceman1001 39e7a58389 default to oem 900 for C15001 format 2021-03-04 09:53:01 +01:00
Ave 278ba103ce ntag_getsig: Introduce ntag_getsig 2021-02-28 12:55:33 +03:00
iceman1001 cb97b67cc5 spelling 2021-02-28 10:29:40 +01:00
iceman1001 4ab382065a cppchecker 2021-02-27 19:13:19 +01:00
iceman1001 3ee657c0f7 cppchecker 2021-02-27 19:12:03 +01:00
iceman1001 eef2a63081 cppchecker 2021-02-27 19:09:57 +01:00
iceman1001 404161d8b0 cppchecker 2021-02-27 19:08:35 +01:00
iceman1001 159a12e357 hf 14b sriwrite - now uses cliparser 2021-02-27 18:50:12 +01:00
Ave 23f831d6a9 emrtd: fix segfaults when debug print is enabled 2021-02-25 20:21:10 +03:00
iceman1001 3fd8a640c1 cppchecker - integeroverflow 2021-02-24 18:00:38 +01:00
iceman1001 a769752aaf cppchecker invalid-printf 2021-02-24 17:41:12 +01:00
iceman1001 b6965425bc textual, cppchecker 2021-02-24 00:17:30 +01:00
iceman1001 3cd282ce87 cppchecker 2021-02-24 00:10:13 +01:00
iceman1001 f5aa78e668 cppchecker shadow 2021-02-24 00:02:59 +01:00
iceman1001 59cd54e178 cppchecker 2021-02-23 23:04:47 +01:00
iceman1001 99dcb8122a cppchecker 2021-02-23 23:04:43 +01:00
iceman1001 4620c0b21e cppchecker fixes 2021-02-23 23:00:29 +01:00
iceman1001 6d329a0462 coverity fixes 2021-02-23 18:23:53 +01:00
iceman1001 da9d041301 added the possibility to protect and manually verify the write 2021-02-22 21:58:09 +01:00
iceman1001 954ad74bc0 ... this time fix out bounds loop.. and some nice outputs 2021-02-22 13:48:58 +01:00
iceman1001 b41be82a6c hf 15 - prepcmd beyond array boundery fix 2021-02-22 13:12:37 +01:00
iceman1001 fad29cb755 only look if no key is applied 2021-02-21 11:04:15 +01:00
iceman1001 0073fc1a71 Modified the flashing feedback text to include suggest steps 2021-02-21 10:46:39 +01:00
Iceman 6f8f96634e
Merge pull request #1209 from aveao/emrtd 
emrtd: Add EF_CardAccess parsing to offline info
 2021-02-21 01:22:36 +01:00
Ave 8904162d7a emrtd: Add EF_CardAccess parsing to offline info 2021-02-21 03:15:26 +03:00
Iceman 0c374bbded
Merge pull request #1207 from aveao/patch-1 
lf t55: Fix a typo
 2021-02-21 01:04:13 +01:00
Iceman 070e20fbe0
Merge pull request #1208 from aveao/emrtd-pr/pacedet 
emrtd: Add PACE algo detection
 2021-02-21 01:03:53 +01:00
iceman1001 9cefece2a7 defaults 2021-02-21 00:42:52 +01:00
Ave dd62a9f8dd emrtd: Parse some other parts of EF_CardAccess 2021-02-21 02:18:10 +03:00
Ave 0f1ba33b69 emrtd: Add PACE algo detection 2021-02-21 01:43:59 +03:00
Ave 4a738963b3
lf t55: Fix typos 2021-02-20 22:35:31 +00:00
Ave 71b73cad0f emrtd: add a PACE display to hf emrtd info 
Also reword things so that they don't misuse BAC in place of any form of
passive authentication
 2021-02-20 22:28:03 +03:00
iceman1001 de42d3c55e hf mfu info - adapted the fingerprinting 2021-02-20 13:06:01 +01:00
iceman1001 e13108023a adapt lua script to handle PS odd 32b limit, my best guess the WIN32 macro is set. 2021-02-20 08:36:33 +01:00
iceman1001 f00c00c150 hf mfu info - start in identify system of a mfu/ntag tag 2021-02-19 20:41:32 +01:00
iceman1001 e729d1804d text 2021-02-19 20:40:00 +01:00
iceman1001 292bbe5738 Added new bulk enrolling lua script for EM4100 for Amal 2021-02-19 20:14:11 +01:00
iceman1001 937e754830 sort out amiitool linking to pm3 client in cmake 2021-02-19 19:10:21 +01:00
iceman1001 bf62e47575 fix.... 2021-02-19 17:37:41 +01:00
iceman1001 f6b1cfd64c maur pk 2021-02-19 16:56:22 +01:00
iceman1001 aa65426e56 fix compilation 2021-02-19 14:30:36 +01:00
iceman1001 0bfb6cd625 fix NIL 2021-02-19 14:20:04 +01:00
iceman1001 bb0d309304 amii tool now using fileutils 2021-02-19 13:41:28 +01:00
iceman1001 9293a25e3e hf 14a info - add MFC EV1 signature checks 2021-02-19 13:39:35 +01:00
iceman1001 e5b879cbe9 rdv4 device detection added 2021-02-17 11:52:23 +01:00
iceman1001 88d95b639f text 2021-02-17 11:42:37 +01:00
iceman1001 e129244a66 ..types 2021-02-17 10:46:58 +01:00
iceman1001 b3064c4888 style 2021-02-17 08:59:20 +01:00
iceman1001 563f703d6a lf hid clone - hooked up the binary input 2021-02-17 08:56:42 +01:00
iceman1001 b979ed3e17 style 2021-02-17 07:33:29 +01:00
iceman1001 45fea41084 text 2021-02-17 07:32:38 +01:00
Iceman 7a7d4654e1
Merge pull request #1204 from adadnc/master 
Minor changes to hf jooki command
 2021-02-17 07:28:33 +01:00
Akif Dinc f7359bcc65 Fixing bug in tid selection 2021-02-16 23:30:40 +01:00
iceman1001 bb823762fa textual 2021-02-16 22:40:54 +01:00
Akif Dinc 23be1158c6 Remove useless comment 2021-02-16 22:37:17 +01:00
Akif Dinc 76b73b26d3 Fixing short commands for figurine names 2021-02-16 22:34:39 +01:00
Akif Dinc 2a07959da6 Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 2021-02-16 21:16:35 +01:00
Akif Dinc 5c385e8f2f Changes to Jooki command codes 2021-02-16 20:55:48 +01:00
Akif Dinc be25db2804 Adding Figurine Type ID and Figurine ID parameters for hf jooki 2021-02-16 20:53:53 +01:00
iceman1001 9593dd05ad lf search - rearrange checks to minimize number of false positives of indala 2021-02-16 15:36:39 +01:00
tharexde 84d19bb22d Merge branch 'master' into refactor_em4x50 
update 210215
 2021-02-15 21:40:20 +01:00
iceman1001 db4bd209a4 no unicode.. 2021-02-15 17:04:35 +01:00
iceman1001 8c7bcd42c7 textual 2021-02-15 11:01:01 +01:00
iceman1001 3ba8dffe75 rename "hf jooki write -> clone", adapted tid/fid 2021-02-15 02:59:14 +01:00
tharexde 1680a1700e Merge branch 'master' into 4x50_standalone 
merged master
 2021-02-14 15:53:44 +01:00
tharexde 9a96157e82 initial implementation of em4x50 standalone mode 2021-02-14 12:42:47 +01:00
tcprst 987f95cca9
bugfix 2021-02-13 23:29:58 -05:00
tcprst 282dc099b6
rework hf mf chk and cliparser for hf mf fchk 2021-02-13 21:03:57 -05:00
tcprst 7830c0f8ea
update type to lits 2021-02-13 15:41:10 -05:00
tcprst dc1e2df649
make style - again 2021-02-13 14:48:44 -05:00
tcprst defc8b52fd
Merge branch 'cliparser/mfc' of https://github.com/tcprst/proxmark3 into cliparser/mfc 2021-02-13 14:47:11 -05:00
tcprst d793a601da
make style 2021-02-13 14:38:51 -05:00
tcprst 9cca51f61e
hf mf chk - now use cliparser 2021-02-13 14:37:47 -05:00
tcprst b7b0830194
hf mf staticnested - now use cliparser 2021-02-13 14:27:00 -05:00
tcprst 200e2e540f
hf mf nested - now use cliparser 2021-02-13 14:27:00 -05:00
tcprst 006246bf8c
hf mf sim - now use cliparser 2021-02-13 14:27:00 -05:00
tcprst 0ade8a5505
hf mf darkside - now use cliparser 2021-02-13 14:26:59 -05:00
tcprst 7d37481ce1
hf mf dump - now uses cliparser 2021-02-13 14:26:59 -05:00
tcprst eec13e8798
hf mf ice - now use cliparser 2021-02-13 14:26:52 -05:00
iceman1001 4e157aa94a hf jooki sim - copy uid and use correct flag 2021-02-13 06:40:42 +01:00
tharexde ac0ef23d5e Merge branch 'master' into dev_4x50_standalone 
update
 2021-02-12 23:21:49 +01:00
iceman1001 4c7c3643f3 hf jooki sim - fix lockbits 2021-02-12 20:54:30 +01:00
iceman1001 29476bb923 change from NTAG215 -> NTAG213 2021-02-12 20:35:26 +01:00
iceman1001 8ece2ca023 hf jooki sim - set type to NTAG215 2021-02-12 19:28:32 +01:00
iceman1001 9f44abe2f4 hf jooki sim - fixed a wrong bcc0 calc and forgot to convert it to the new dump format.. 2021-02-12 18:47:41 +01:00
iceman1001 667e2bb9f8 fix pm3test for mfu keygen. UID array was not zero:d 2021-02-12 11:10:58 +01:00
iceman1001 0f40e97b71 lf gallagher demod - remove debug statements 2021-02-12 10:38:57 +01:00
iceman1001 69a73675fb text 2021-02-12 10:32:07 +01:00
iceman1001 46d9ed20e5 added "hf jooki sim" command. Lets see if the data_available call every 8000th times doesnt interrupt with simulation process too much. 2021-02-12 10:16:24 +01:00
iceman1001 73cd4fb4ff lf gallagher sim - about w user input. Coverity fixes 2021-02-12 10:14:54 +01:00
iceman1001 7a653e7faf textual 2021-02-12 09:10:55 +01:00
iceman1001 152a2b43c0 hf jooki encode - fix tagtype.. 2021-02-11 23:18:17 +01:00
iceman1001 f9e1106842 remove debugs message 2021-02-11 23:12:13 +01:00
iceman1001 cdbef43f1a hf jooki write - may work... 2021-02-11 23:09:45 +01:00
Iceman 9ae5b8aa83
Merge pull request #1195 from DarkMatterMatt/feat/gallagher-simulate 
Support specifying region/facility/card/issue numbers to Gallagher simulation
 2021-02-11 22:43:30 +01:00
iceman1001 3ef308120c fix signedness 2021-02-11 22:37:12 +01:00
iceman1001 05e85cbbe2 fixing some type conversions 2021-02-11 22:26:15 +01:00
DarkMatterMatt d7a1145945 Add support for specifying region/facility/card/issue numbers to Gallagher simulation 
Extract `region_code`/`facility_code`/`card_number`/`issue_level` validation to `isValidGallagherParams` function
Add `--rc/fc/cn/il` parameters to `lf gallagher sim`
 2021-02-12 10:23:05 +13:00
iceman1001 c576a0065b hf jooki - encode / decode ... 2021-02-11 22:08:51 +01:00
iceman1001 db29f0a691 textual.. 2021-02-11 15:37:35 +01:00
iceman1001 6416aaa52b add simple detection of file based on extension ftc 2021-02-11 15:36:56 +01:00
iceman1001 bd57430058 ..not recommend _keep field on_ 2021-02-11 15:35:12 +01:00
Akif Dinc 724ac35665 Typo in hf 14a help 2021-02-11 12:22:40 +01:00
DarkMatterMatt 73465e5167 Reorder & simplify code 2021-02-11 17:36:02 +13:00
DarkMatterMatt 03347fcfea Refactor how blocks are generated to be cleaner 2021-02-11 14:07:14 +13:00
DarkMatterMatt 0fdbdb044f Use ARRAYLEN instead of constant length 2021-02-11 11:30:22 +13:00
DarkMatterMatt 62ccbc0a37 Fix styles 
Run `make style`
 2021-02-11 11:12:45 +13:00
DarkMatterMatt f655391bd4 Initial implementation of encoding 2021-02-11 00:17:48 +13:00
DarkMatterMatt a4da1476b6 Fix Gallagher data decoding & CRC checks 
Descramble function was re-scrambling the data
Skip constant magic prefix `7FEA` to get correct data to decode
Fix offsets & bitmasks to correctly decode card and region codes
Fix CRC refin & refout parameters (both now false)
 2021-02-10 15:47:14 +13:00
Iceman abbbbcebc9
Merge pull request #1189 from craftbyte/master 
make style on master
 2021-02-09 17:57:09 +01:00
Iceman 4825aeaac7
Merge pull request #1182 from craftbyte/feature/mfdes-enum 
Added actual MF DESfire enumeration
 2021-02-09 17:55:09 +01:00
Anže Jenšterle cd36770c5e
make style 2021-02-09 16:56:55 +01:00
Anže Jenšterle 8760068a03
make style 2021-02-09 16:52:48 +01:00
Anže Jenšterle cf8256979d
fix code per comments 2021-02-09 16:15:52 +01:00
Anže Jenšterle 8af1cedf1f
Improved MFDES AID bruteforce 2021-02-09 15:17:20 +01:00
iceman1001 e22cb088c1 fix #1186 2021-02-08 23:56:39 +01:00
Anže Jenšterle 6d10525c09
fixed missing parameter 2021-02-08 03:32:27 +01:00
Anže Jenšterle 99b1093702
Added actual MF DESfire enumeration 2021-02-08 01:12:14 +01:00
tcprst 9da310bb36
hf mf staticnested - now use cliparser 2021-02-07 17:49:45 -05:00
tcprst a82a71b4c8
hf mf nested - now use cliparser 2021-02-07 17:32:25 -05:00
Akif Dinc 535fd2aeff Fixes error in key size check in 'hf mfu info' for EV1/NTAG 2021-02-07 22:21:50 +01:00
tcprst c04556e69e
hf mf sim - now use cliparser 2021-02-07 16:15:22 -05:00
tcprst 23de2777c1
hf mf darkside - now use cliparser 2021-02-07 15:20:16 -05:00
tcprst feb4495124
hf mf dump - now uses cliparser 2021-02-07 15:06:10 -05:00
tcprst eeb6200081
hf mf ice - now use cliparser 2021-02-07 13:30:56 -05:00
iceman1001 2e7d1e299d hf 14a info - bette hint for EMV cards 2021-02-07 15:16:15 +01:00
iceman1001 f96a48242f remake main screen text 2021-02-07 00:18:21 +01:00
iceman1001 53b2ee10df text 2021-02-06 22:25:51 +01:00
iceman1001 6dbca23487 rename hf_mfu_dumptoemulator.lua -> data_mfu_bin2eml.lua 2021-02-06 21:39:24 +01:00
tharexde 94ede77573 timeout adaption 2021-02-06 19:59:34 +01:00
Ave 7947d2efb9 emrtd: Calculate document type from MRZ length 
+ Add the German Aufenthaltstitel
 2021-02-06 19:11:45 +03:00
iceman1001 a168e4328f rename a fct 2021-02-05 16:37:20 +01:00
iceman1001 1c576d10c8 lf t55xx dangerraw - now uses cliparser 2021-02-05 16:37:08 +01:00
iceman1001 6bcf31e68c lf t55 detect - now use cliparse .. which also makes it work with the wakeup command again 2021-02-05 14:32:52 +01:00
iceman1001 5941ee6799 lf t55xx p1detect - too small alloc for argtable 2021-02-05 12:25:07 +01:00
iceman1001 793b55053f clean up 2021-02-05 08:58:46 +01:00
iceman1001 b6cac81b3b lf t55xx wakeup - now uses cliparser 2021-02-05 08:58:19 +01:00
iceman1001 7d1897cd52 lf em 410x brute - now works without pressing enter every time to continue one step 2021-02-04 22:36:08 +01:00
iceman1001 4da7d93c51 remove dubbles 2021-02-04 22:05:05 +01:00
iceman1001 63739b25d3 started to add touch nd go keygen algo from metrodroid 2021-02-04 22:02:07 +01:00
iceman1001 2a17cb5545 lf cmdread - now uses cliparser. Had to change the "extra" param structure to fit.\n lf config - now has a reset param 2021-02-04 22:01:23 +01:00
iceman1001 967f5ffd51 lf config - now uses cliparser 2021-02-03 16:00:54 +01:00
iceman1001 f9c2f35c8b lf read - now uses cliparser 2021-02-03 10:33:02 +01:00
iceman1001 5a102a4347 lf sniff - now uses cliparser 2021-02-03 09:22:36 +01:00
iceman1001 ff98bb047d lf t55xx wipe - better handling of wrong length pwd 2021-02-03 00:15:19 +01:00
iceman1001 92b1ccc935 wiegand encode - now has option to add hid preamble or not 2021-02-03 00:14:40 +01:00
iceman1001 a78e610f18 nespress defaults 2021-02-02 20:49:36 +01:00
iceman1001 47c27d751c lf awid/hid/io/410x watch - now works with user side abort 2021-02-02 17:55:54 +01:00
iceman1001 ea7d4ae496 lf em 410x reader - new param "-b" to break after once, use together with continouse mode.\n lf em 410x spoof - works again 2021-02-02 16:34:45 +01:00
iceman1001 72a837d813 text, more cliparser, hid/awid sim can use keypress too 2021-02-02 16:33:43 +01:00
iceman1001 edc8165576 lf psksim - correct swapping with user data or demodbuffer data 2021-02-02 09:13:13 +01:00
iceman1001 fa3a1f1cbf lf simpsk - now uses cliparser. And simulation can be broken by enter or button press 2021-02-01 23:52:48 +01:00
iceman1001 31e1db1bc2 hf 14a info - identify HID SEOS. ATQA: 00 01, SAK 20 2021-01-31 23:43:15 +01:00