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

7865 commits

Author SHA1 Message Date
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
iceman1001 3a051b3266 lf indala sim - now it works again 2021-01-31 01:09:27 +01:00
Ave 8f8263ae59 emrtd: Fix EF_DG2 image dumping 2021-01-29 23:27:33 +03:00
iceman1001 e29bbcf6c3 text 2021-01-29 20:35:36 +01:00
iceman1001 ea5625c304 chg: cliparse error message unified to pm3 style 2021-01-29 20:35:18 +01:00
iceman1001 e42985b65c testing crc32 2021-01-29 19:28:45 +01:00
iceman1001 76f2c2c95e cppchecker fix 2021-01-29 16:51:06 +01:00
iceman1001 a6e4b03c28 coverty finds this a deadcode, cppchecker complains... 2021-01-29 16:18:09 +01:00
iceman1001 3b37ca1d4c coverity fix #308455 2021-01-29 16:06:45 +01:00
iceman1001 ead26ec3c3 lf t55xx special - now uses cliparser 2021-01-29 16:06:26 +01:00
iceman1001 831a3ad2fa hw dbg - fix wrong param 2021-01-29 12:13:54 +01:00
iceman1001 249d3e7d1e text 2021-01-29 12:04:19 +01:00
iceman1001 dc01b63d49 analyse demodbuff - bad reference to string pointer after free 2021-01-29 11:59:32 +01:00
iceman1001 b3c0e00174 wiegand encode - now "-w" format param is optional, if excluded it tries to convert to all known formats and output 2021-01-29 11:56:31 +01:00
iceman1001 165ceb122f update to correct filename for the sample file 2021-01-28 21:41:57 +01:00
iceman1001 90fb78ff1b cppchecker fix 2021-01-28 21:38:30 +01:00
iceman1001 6737f6f3cd sanitize fix - lf/hf tune heap overflow 2021-01-28 20:31:39 +01:00
iceman1001 405b93f109 coverity fix 309975 2021-01-28 15:29:52 +01:00
iceman1001 56b4a480cd cppchecker fix, realloc should already freed it 2021-01-28 14:33:30 +01:00
iceman1001 2c73337bde cppchecker ,, silence a warning 2021-01-28 14:32:57 +01:00
iceman1001 6633214957 cppchecker fix 2021-01-28 14:22:44 +01:00
iceman1001 12c0eb97fb cppchecker fix 2021-01-28 14:20:33 +01:00
iceman1001 a5f4212809 cppchecker fix 2021-01-28 14:18:44 +01:00
iceman1001 11a95d7351 cppchecker fix 2021-01-28 14:16:42 +01:00
iceman1001 10e2829123 cppchecker fix UID might be NULL 2021-01-28 14:11:33 +01:00
iceman1001 beb6a8bf11 cppchecker 2021-01-28 14:09:25 +01:00
iceman1001 3ad822844f cppchecker ... 2021-01-28 14:08:47 +01:00
iceman1001 3fead5b93c cppchecker... 2021-01-28 13:53:37 +01:00
iceman1001 46767a07e7 cppchecker 2021-01-28 13:50:27 +01:00
iceman1001 785d790ea0 cppchecker fix 2021-01-28 13:48:28 +01:00
iceman1001 12a28fcd16 cppchecker fix hf 14b 2021-01-28 13:38:58 +01:00
iceman1001 fd7a25beed cppchecker fix - hf mfu restore and key param 2021-01-28 13:34:03 +01:00
iceman1001 58cbe90469 rename 2021-01-28 01:21:52 +01:00
iceman1001 fdcc4b741c fix lf em 4x05 write - pwd/data. t55xx chk - now uses cliparser, and color to cliparser empty message 2021-01-27 22:52:08 +01:00
iceman1001 7f78b0a85d text and test fix for lf search 2021-01-27 14:36:43 +01:00
iceman1001 3176d05a2a lf simbidir - now use cliparser 2021-01-27 14:14:59 +01:00
iceman1001 35cc4125bd lf search - now use cliparser 2021-01-27 14:11:36 +01:00
Iceman 375909653d
Merge pull request #1174 from McEloff/trace_list_mf_dict 
`trace list -t mf` - now can use external dictionary keys file
 2021-01-27 12:49:06 +01:00
Eloff 2218b4e7db minor fix 2021-01-27 14:43:50 +03:00
iceman1001 d39e0939b6 fix t55xx protect/recoverpw - make param pwd optional 2021-01-27 09:09:42 +01:00
McEloff 11b94e7748 trace list -t mf - now can use external dictionary keys file 2021-01-27 01:14:20 +03:00
iceman1001 fad3658604 fix 'lf t55 sniff' input params 2021-01-26 22:26:19 +01:00
iceman1001 05c5985073 fix #1173 - added guards 2021-01-26 10:47:55 +01:00
Philippe Teuwen 6a13a0c349 hardnested: one more init 2021-01-26 01:07:32 +01:00
Philippe Teuwen 658a62f761 hardnested: add missing init, fixing some segfault 2021-01-25 23:48:19 +01:00
iceman1001 20fccb16aa hf mf hardnested - changed to calloc, and some text 2021-01-25 22:12:17 +01:00
iceman1001 89b9ddff78 Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2021-01-25 22:09:12 +01:00
iceman1001 c571b1e0ad hf mf hardnested - clear these too 2021-01-25 20:59:32 +01:00
iceman1001 77d51cae38 hf mf hardnested - just making sure its cleared 2021-01-25 20:55:28 +01:00
iceman1001 2305411a1d hf mf hardnested - added missing init 2021-01-25 19:38:47 +01:00
Philippe Teuwen 134ddf6313 hardnested offline: avoid reaching out for pm3 2021-01-25 17:31:25 +01:00
iceman1001 ba8cd68942 hf mf hardnested - NUM_SUMS is 19, making loop iterator smaller 2021-01-25 14:31:17 +01:00
iceman1001 078a28550f hf mf hardnested - these are called with u16 in the source 2021-01-25 14:28:47 +01:00
iceman1001 a658d5dd1e Merge branch 'master' of github.com:RfidResearchGroup/proxmark3 2021-01-25 14:15:58 +01:00
Philippe Teuwen 0fee0c97cb make style 2021-01-23 22:38:07 +01:00
iceman1001 2987fdb187 added warning prefix 2021-01-23 19:08:45 +01:00
iceman1001 4d2d65a0c6 lf fdx reader - check both 125 / 134 freqs. 2021-01-22 22:58:50 +01:00
Marcos Del Sol Vives 37f4dee727 Fix out of bounds read 2021-01-22 22:22:04 +01:00
tharexde 843dd9bef4 deleted unneeded include statement 2021-01-20 19:47:55 +01:00
tharexde d41a884c2f restoring filename from commit. 2021-01-20 19:47:14 +01:00
tharexde e061645c6b deleted unneeded include statement 2021-01-20 19:37:38 +01:00
tharexde 3620ebd673 Merge branch 'master' into dev_4x50_sim_full 
update 210120
 2021-01-20 19:07:39 +01:00
iceman1001 9945e1b358 added some sleeps 2021-01-20 14:28:49 +01:00
iceman1001 abb0d1c437 forgot the 'r' change became long param '--r0' 2021-01-20 12:22:52 +01:00
iceman1001 0555b69b68 update docs 2021-01-20 11:58:43 +01:00
tharexde 78d1e09595 deleted test functions, clean up 2021-01-18 00:01:22 +01:00
tharexde ef56bee76a Merge branch 'master' into sim_half_duplex 
update 210117
 2021-01-17 00:31:38 +01:00
tharexde cff48f84c6 refactoring 2021-01-16 19:40:42 +01:00
tharexde c15266dfc2 added timeouts 2021-01-16 01:59:02 +01:00
Niel Nielsen b0c160f236
Added honor to Iceman1001 
Added star command in honor of @Iceman1001 hard work on this project
 2021-01-14 14:34:55 +01:00
iceman1001 d7baee2f0c swapped PM3OTHER -> PM3GENERIC, while keeping PM3OTHER functionalitwise for backwards compat. 2021-01-14 14:23:00 +01:00
Philippe Teuwen f2bc066858 make style 2021-01-14 11:39:45 +01:00
iceman1001 e723ebea12 lf t55 bruteforce - now use cliparser 2021-01-12 20:59:44 +01:00
iceman1001 55b76f0d4c lf t55xx recoverpw .. - now uses cliparser 2021-01-12 20:38:55 +01:00
iceman1001 9351d29a48 usart btfactory - improve warning message given the cliparser template limit 2021-01-12 00:30:16 +01:00
iceman1001 59c4a38674 lf t55xx protect/sniff - now use cliparser 2021-01-12 00:11:40 +01:00
iceman1001 ad1f3eae57 added some supprt fct for cliparser, to take a hex byte param and fall back to a default value, or specify how many bytes the param must be 2021-01-11 23:29:49 +01:00
iceman1001 b60daea570 lf t55xx sniff - now uses cliparser 2021-01-10 12:52:57 +01:00
iceman1001 12e80bb8a6 analyze freq - use cliparser, foo - to play with fpga muxer data simulator (anticat) 2021-01-09 22:50:53 +01:00
iceman1001 93c99e9f7a lf hid clone - wip take binary string as input 2021-01-09 22:47:04 +01:00
iceman1001 005079b91f lf hitag info, sniff - now uses cliparser 2021-01-09 22:45:17 +01:00
iceman1001 8b7ef202c3 pref savedefaultpaths uses cliparser, enabled but is not used in the fileutils yet. 2021-01-09 22:44:09 +01:00
iceman1001 ee8309e09b pref cmds - now use cliparser. renamed a enum to fit the global scope better 2021-01-09 14:00:58 +01:00
iceman1001 2239b2dff0 all analyse cmds now use cliparser 2021-01-09 12:32:50 +01:00
iceman1001 5f92562856 analyze a - now uses cliparser 2021-01-09 11:50:26 +01:00
iceman1001 3f4a98901d analyze nuid - now uses cliparser, and refactored to generators 2021-01-09 11:43:49 +01:00
iceman1001 ae45dbd877 analyze chksum - now uses cliparser 2021-01-09 11:27:05 +01:00
Samy Kamkar fab65d1dcd Add EV3 to hf 14a info 2021-01-08 16:23:39 -08:00