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

2375 commits

Author SHA1 Message Date
Brian Pow a84d863fc2 use PrintAndLogEx() instead of PrintAndLog(), tweak messages 2018-02-21 20:43:54 +08:00
Brian Pow bec3b6c468 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:54 +08:00
Brian Pow 4306f85343 tweak messages 2018-02-21 20:43:54 +08:00
Brian Pow 9b7bd49665 tweak messages 2018-02-21 20:43:53 +08:00
Brian Pow 6003d4ffa0 tweak messages 2018-02-21 20:43:53 +08:00
Brian Pow 858224244d tweak messages 2018-02-21 20:43:53 +08:00
Brian Pow 43ec321e53 tweak messages 2018-02-21 20:43:53 +08:00
Brian Pow b1318c6e0c use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:52 +08:00
Brian Pow 618b868daf tweak message 2018-02-21 20:43:52 +08:00
Brian Pow c80c992ff3 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:52 +08:00
Brian Pow 2cea36c3b5 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:51 +08:00
Brian Pow 740a1daaa4 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:51 +08:00
Brian Pow 8e15b3fa22 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:51 +08:00
Brian Pow 8c435c2725 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:51 +08:00
Brian Pow 0f6e779e0d use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:51 +08:00
Brian Pow 8a408088af tweak message 2018-02-21 20:43:51 +08:00
Brian Pow d34e95b9a8 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:50 +08:00
Brian Pow 2a3f670e0c use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:50 +08:00
Brian Pow 621a349e61 tweak messages 2018-02-21 20:43:50 +08:00
Brian Pow 4afe5e6ce0 tweak messages 2018-02-21 20:43:50 +08:00
Brian Pow 6582a2ccb1 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:50 +08:00
Brian Pow cafa0649f5 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:50 +08:00
Brian Pow 02694401e8 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:49 +08:00
Brian Pow b8f106d7a7 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:49 +08:00
Brian Pow 44bd1cd13d use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:49 +08:00
Brian Pow 9aee92f27d use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:49 +08:00
Brian Pow 5b0233854d use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:49 +08:00
Brian Pow ec0fa961a1 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:49 +08:00
Brian Pow 78647f4502 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:48 +08:00
Brian Pow 37b1b9a650 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:48 +08:00
Brian Pow cf7b12a734 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:48 +08:00
Brian Pow 72ce7dc595 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:48 +08:00
Brian Pow d8c8874bdf use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:48 +08:00
Brian Pow 9fa5d23cc5 use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:43:47 +08:00
Brian Pow 7e125b9bfb use PrintAndLogEx() instead of PrintAndLog() 2018-02-21 20:39:54 +08:00
Iceman 4efb9aba4d
Merge pull request #177 from brianpow/PrintAndLogEx 
add PrintAndLogEx()
 2018-02-21 07:20:43 +01:00
Brian Pow 68fddf00ce simplify PrintAndLogEx() 2018-02-21 14:10:44 +08:00
iceman1001 4e915d2eb4 chg: prng detection now takes in consideration if detection fails. 2018-02-20 21:20:17 +01:00
iceman1001 9512f60227 chg: formatMifare.lua helptext output 2018-02-20 20:20:34 +01:00
iceman1001 5dbfb627fc chg: 'brutesim' - script prints author and checks for being called with no arguments. 2018-02-20 20:18:37 +01:00
iceman1001 5b6a5206df add: 'script run lf_bulk' - the original script is call lf_buld_program but thats a too long name, with adaptations in code. 
chg: some script textual output
 2018-02-20 20:16:30 +01:00
tuxthemadpenguin ce27e5d7e1
Adding MBTA keys - same for every card 2018-02-19 11:02:18 -05:00
iceman1001 e6f51451aa chg: added the mutex lock to printing in communications thread. 2018-02-18 10:36:15 +01:00
iceman1001 41540ae1c1 chg: removed warning of uninitilised 2018-02-15 23:47:16 +01:00
iceman1001 9e1e9af794 chg: 'data autocorr' - adjustment of parameters. 2018-02-15 20:23:54 +01:00
iceman1001 a38904c453 CHG: 'data autocorrelate' - now using proper autocorrelate algo. 2018-02-15 17:57:28 +01:00
Brian Pow 5ea8b4348c add PrintAndLogEx() 2018-02-15 23:32:08 +08:00
iceman1001 a1dd7c2020 chg: 'hf list mf' - adapted the output from 16bytes rows to 18 in order to make output more easily to compare 2018-02-15 11:47:34 +01:00
Federico Cerutti 8d152d24f2 Merge branch 'master' of https://github.com/iceman1001/proxmark3 2018-02-15 00:21:25 +01:00
Federico Cerutti 58ddd53fb0 Removed hf 15 select: broken command 2018-02-15 00:13:27 +01:00
iceman1001 acda2ebc66 fix: 'hf list mf' - decrypting works now. Missed a bit. 2018-02-15 00:03:01 +01:00
iceman1001 326079fbb6 chg: timing text 2018-02-14 23:53:32 +01:00
iceman1001 b8ddb3b384 chg: 'hf list mf' - 10b uid 2018-02-14 23:48:45 +01:00
iceman1001 ad99b4f394 add: 'hf list mf' - old 'hf mf sniff' decoding of data has now been incorporated annotations instead. (@merlokk) 
---most likely broke something.. :)  needs proper testing.
 2018-02-14 23:03:39 +01:00
iceman1001 604aaf5356 fix: missing in header.. 2018-02-14 21:56:28 +01:00
Iceman 2b78b785f3
Merge pull request #173 from brianpow/rename-prnlog-to-PrintfAndLog 
Rename prnlog() to PrintfAndLog()
 2018-02-14 21:47:54 +01:00
iceman1001 b2a3b0f72a chg: 'lf cmdread' @marshmellow42 improvements from https://github.com/Proxmark/proxmark3/pull/570 
chg:  and some adaptations..
 2018-02-14 21:40:52 +01:00
iceman1001 8c5ab9cf18 textual 2018-02-14 16:18:04 +01:00
iceman1001 e09d5385bf chg: clearing some mem.. 2018-02-14 15:27:39 +01:00
iceman1001 97803733ce fix: 'hf 15 raw' - wrong length when using -c param 
https://github.com/iceman1001/proxmark3/issues/174
 2018-02-14 15:24:45 +01:00
iceman1001 46d540490f chg: add response ack. 2018-02-13 15:45:15 +01:00
iceman1001 1709c1ce1a chg: flash_mem - hooked up client - device comms 2018-02-13 15:36:20 +01:00
Brian Pow 8f9c81ae81 Rename prnlog() to PrintfAndLog() 2018-02-13 00:12:50 +08:00
iceman1001 1b8ff6c45c syntax 2018-02-11 17:46:14 +01:00
Iceman 9af8d0e7ac
Merge pull request #164 from brianpow/master 
CHG: 'hf mf dump' now use hf-mf-UID-key.bin and hf-mf-UID-data.bin in…
 2018-02-11 17:42:40 +01:00
Iceman 442ad9f481
Merge pull request #172 from n0ncetonic/patch-2 
Adds default PicoPass 2k Exchange Key
 2018-02-11 14:10:57 +01:00
noncetonic b3c6103f92
Adds key 
Actually adds the key...
 2018-02-09 11:24:25 -08:00
noncetonic fb05042b71
Adds default PicoPass 2k Exchange Key 
PicoPass 2k doc describes loading Kd and Kc via their "encrypted values" composed of the default exchange key  XOR'd with Kd/Kc
 2018-02-09 10:12:40 -08:00
Brian Pow 8b00d6c121 FIX: remove ISO14A_NO_DISCONNECT when reading the UID from mifare card 2018-02-10 00:01:50 +08:00
Brian Pow b1d414c680 CHG: replace 'samples:' with 'Examples:', unify some usage text 2018-02-09 22:56:16 +08:00
Brian Pow a02ec72f50 CHG: 'hf mf hardnested r' now read the corresponding bin file if tag presents, otherwise read nonces.bin 2018-02-09 22:56:16 +08:00
Brian Pow e1bc58692d Improved error detection and message if missing paramters for 'hf mf hardnested' 2018-02-09 22:56:15 +08:00
Brian Pow 35e62e7d1f CHG: 'hf mf hardnested' now use hf-mf-<UID>-nonces.bin by default, with parameter 'u' or 'f' to override. 2018-02-09 22:56:15 +08:00
Brian Pow d9882c9167 ADD: help in 'hf mf ice'. Save to hf-mf-<UID>-nonces.bin by default, with 'f' switch to override the default name 2018-02-09 22:56:15 +08:00
Brian Pow 53540fe206 ADD: 'hf mf restore' now allow user to specify the filename to restore 2018-02-09 22:56:15 +08:00
Brian Pow 756378e3c7 CHG: Added two switches for 'hf mf dump'. 'k' for key filename and 'f' for data filename, 
FIX: Stop dumping/restoreing a tag if failed to generate filename using uid
 2018-02-09 22:56:14 +08:00
Brian Pow 19fc90fa71 FIX: Stop dumping/restoreing a tag if failed to generate filename using uid 2018-02-09 22:54:55 +08:00
Brian Pow 8e04df77ba FIX: GenerateFilename() return broken filename if no tag is detected. 2018-02-09 22:54:55 +08:00
Brian Pow 45c20d62b8 FIX: wrongly assume the max size of UID to 8 bytes. Max size should be 10 bytes. 2018-02-09 22:54:55 +08:00
Brian Pow 551cc5539b Updated header file for better consistency of parameter name 2018-02-09 22:54:55 +08:00
Brian Pow 39d2a92ead CHG: use FillFileNameByUID() for filename generation for 'hf 15 dump' 2018-02-09 22:54:54 +08:00
Brian Pow d050e473b7 CHG: use FillFileNameByUID() for filename generation for 'hf mf dump' and 'hf mf chk * ? d' 2018-02-09 22:54:54 +08:00
Brian Pow 314253c359 CHG: 'hf mf dump' now use hf-mf-UID-key.bin and hf-mf-UID-data.bin instead of dumpkey.bin and dumpdata.bin as default name 2018-02-09 22:54:54 +08:00
iceman1001 f1dcdaef27 fix: 'hf mf fchk' wrong number of vars to format string 2018-02-09 13:40:28 +01:00
iceman1001 5b596f8e82 chg: 'hw tune' - only show plotwindow if LF antenna is connected (ie we get lf values) 2018-02-09 13:39:32 +01:00
iceman1001 ff598db839 textual 2018-02-09 00:28:30 +01:00
iceman1001 76e6683ac4 text 2018-02-09 00:27:30 +01:00
iceman1001 5adb9af78f chg: 'hw tune' - compensating the 3% error marginal. 2018-02-09 00:25:45 +01:00
iceman1001 fe34cac012 FIX: 'hf mf darkside' - no more WDT crashes. plus positive sideeffects (@pwpiwi) 
https://github.com/Proxmark/proxmark3/pull/569
 2018-02-08 19:11:35 +01:00
noncetonic 20af8e78ad
Adds PicoPass 2k Kd 
Found in documentation when describing how the exchange key is used with default Kd to send encrypted Kd. Kc also referenced but not sure if it's super useful
 2018-02-08 06:05:31 -08:00
iceman1001 39de74cb78 fix: wrong block 2018-02-08 12:39:35 +01:00
iceman1001 357cf59f1b textual 2018-02-08 12:35:59 +01:00
iceman1001 220614ca10 fix: 'hf iclass reader' - drop field when finished. 2018-02-08 12:34:13 +01:00
iceman1001 b31afcfc31 fix: 'hf iclass reader' - missing CC 2018-02-08 12:18:40 +01:00
iceman1001 2847a147b5 fix: 'hf iclass dump', missing CC 2018-02-08 12:15:47 +01:00
iceman1001 f6d314d09e chg: iclass dump textual.. 2018-02-08 11:03:11 +01:00
iceman1001 28e73824e1 chg: 'hf iclass dump' - more texts 2018-02-08 10:49:44 +01:00
iceman1001 30e9395590 fix: 'hf iclass lookup' - exit when failed to load dictionary file 2018-02-08 10:32:14 +01:00
iceman1001 7bf6e0d089 fix: 'hf iclass chk' - checking keys outside the first chunk of 128. 2018-02-08 09:30:34 +01:00
iceman1001 fb4b3502ef fix: 'script run mifare_autopwn.lua' - wrong bool comparision 2018-02-07 23:54:11 +01:00