mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-03-19 19:38:52 +08:00
Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3
This commit is contained in:
commit
594398ef73
2 changed files with 88 additions and 10 deletions
|
@ -127,9 +127,9 @@ static int usage_hf14_nested(void) {
|
||||||
PrintAndLogEx(NORMAL, " d write keys to binary file `hf-mf-<UID>-key.bin`");
|
PrintAndLogEx(NORMAL, " d write keys to binary file `hf-mf-<UID>-key.bin`");
|
||||||
PrintAndLogEx(NORMAL, "");
|
PrintAndLogEx(NORMAL, "");
|
||||||
PrintAndLogEx(NORMAL, "Examples:");
|
PrintAndLogEx(NORMAL, "Examples:");
|
||||||
PrintAndLogEx(NORMAL, " hf mf nested 1 0 A FFFFFFFFFFFF ");
|
PrintAndLogEx(NORMAL, " hf mf nested 1 0 A FFFFFFFFFFFF -- nested attack against 1k,block 0, Key A using key FFFFFFFFFFFF");
|
||||||
PrintAndLogEx(NORMAL, " hf mf nested 1 0 A FFFFFFFFFFFF t ");
|
PrintAndLogEx(NORMAL, " hf mf nested 1 0 A FFFFFFFFFFFF t -- and transfer keys into emulator memory");
|
||||||
PrintAndLogEx(NORMAL, " hf mf nested 1 0 A FFFFFFFFFFFF d ");
|
PrintAndLogEx(NORMAL, " hf mf nested 1 0 A FFFFFFFFFFFF d -- or write keys to binary file ");
|
||||||
PrintAndLogEx(NORMAL, " hf mf nested o 0 A FFFFFFFFFFFF 4 A");
|
PrintAndLogEx(NORMAL, " hf mf nested o 0 A FFFFFFFFFFFF 4 A");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -179,9 +179,10 @@ static int usage_hf14_chk(void) {
|
||||||
PrintAndLogEx(NORMAL, " t write keys to emulator memory\n");
|
PrintAndLogEx(NORMAL, " t write keys to emulator memory\n");
|
||||||
PrintAndLogEx(NORMAL, "");
|
PrintAndLogEx(NORMAL, "");
|
||||||
PrintAndLogEx(NORMAL, "Examples:");
|
PrintAndLogEx(NORMAL, "Examples:");
|
||||||
PrintAndLogEx(NORMAL, " hf mf chk 0 A 1234567890ab keys.dic -- target block 0, Key A");
|
PrintAndLogEx(NORMAL, " hf mf chk 0 A 1234567890ab -- target block 0, Key A using key 1234567890ab");
|
||||||
PrintAndLogEx(NORMAL, " hf mf chk *1 ? t -- target all blocks, all keys, 1K, write to emulator memory");
|
PrintAndLogEx(NORMAL, " hf mf chk 0 A default_keys.dic -- target block 0, Key A using default dictionary file");
|
||||||
PrintAndLogEx(NORMAL, " hf mf chk *1 ? d -- target all blocks, all keys, 1K, write to file");
|
PrintAndLogEx(NORMAL, " hf mf chk *1 ? t -- target all blocks, all keys, 1K, write to emulator memory");
|
||||||
|
PrintAndLogEx(NORMAL, " hf mf chk *1 ? d -- target all blocks, all keys, 1K, write to file");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
static int usage_hf14_chk_fast(void) {
|
static int usage_hf14_chk_fast(void) {
|
||||||
|
@ -199,11 +200,12 @@ static int usage_hf14_chk_fast(void) {
|
||||||
PrintAndLogEx(NORMAL, " m use dictionary from flashmemory\n");
|
PrintAndLogEx(NORMAL, " m use dictionary from flashmemory\n");
|
||||||
PrintAndLogEx(NORMAL, "");
|
PrintAndLogEx(NORMAL, "");
|
||||||
PrintAndLogEx(NORMAL, "Examples:");
|
PrintAndLogEx(NORMAL, "Examples:");
|
||||||
PrintAndLogEx(NORMAL, " hf mf fchk 1 1234567890ab keys.dic -- target 1K using key 1234567890ab, using dictionary file");
|
PrintAndLogEx(NORMAL, " hf mf fchk 1 1234567890ab -- target 1K using key 1234567890ab");
|
||||||
PrintAndLogEx(NORMAL, " hf mf fchk 1 t -- target 1K, write to emulator memory");
|
PrintAndLogEx(NORMAL, " hf mf fchk 1 default_keys.dic -- target 1K using default dictionary file");
|
||||||
PrintAndLogEx(NORMAL, " hf mf fchk 1 d -- target 1K, write to file");
|
PrintAndLogEx(NORMAL, " hf mf fchk 1 t -- target 1K, write to emulator memory");
|
||||||
|
PrintAndLogEx(NORMAL, " hf mf fchk 1 d -- target 1K, write to file");
|
||||||
if (IfPm3Flash())
|
if (IfPm3Flash())
|
||||||
PrintAndLogEx(NORMAL, " hf mf fchk 1 m -- target 1K, use dictionary from flashmemory");
|
PrintAndLogEx(NORMAL, " hf mf fchk 1 m -- target 1K, use dictionary from flashmemory");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
static int usage_hf14_keybrute(void) {
|
static int usage_hf14_keybrute(void) {
|
||||||
|
|
|
@ -767,3 +767,79 @@ A2B2C9D187FB,
|
||||||
A2F63A485632,
|
A2F63A485632,
|
||||||
98631ED2B229,
|
98631ED2B229,
|
||||||
19F1FFE02563,
|
19F1FFE02563,
|
||||||
|
#OMNITEC.ES HOTEL TIMECARD / MAINTENANCECARD
|
||||||
|
AFBECD120454,
|
||||||
|
#OMNITEC.ES HOTEL EMERGENCYCARD
|
||||||
|
842146108088,
|
||||||
|
# MORE KEYS:
|
||||||
|
8A19D40CF2B5,
|
||||||
|
AE8587108640,
|
||||||
|
#TAPCARD PUBLIC TRANSPORT LA
|
||||||
|
EA1B88DF0A76,
|
||||||
|
D1991E71E2C5,
|
||||||
|
05F89678CFCF,
|
||||||
|
D31463A7AB6D,
|
||||||
|
C38197C36420,
|
||||||
|
772219470B38,
|
||||||
|
1C1532A6F1BC,
|
||||||
|
FA38F70215AD,
|
||||||
|
E907470D31CC,
|
||||||
|
160F4B7AB806,
|
||||||
|
1D28C58BBE8A,
|
||||||
|
B3830B95CA34,
|
||||||
|
6A0E215D1EEB,
|
||||||
|
E41E6199318F,
|
||||||
|
C4F271F5F0B3,
|
||||||
|
1E352F9E19E5,
|
||||||
|
0E0E8C6D8EB6,
|
||||||
|
C342F825B01B,
|
||||||
|
CB911A1A1929,
|
||||||
|
E65B66089AFC,
|
||||||
|
B81846F06EDF,
|
||||||
|
37FC71221B46,
|
||||||
|
880C09CFA23C,
|
||||||
|
6476FA0746E7,
|
||||||
|
419A13811554,
|
||||||
|
2C60E904539C,
|
||||||
|
4ECCA6236400,
|
||||||
|
10F2BBAA4D1C,
|
||||||
|
4857DD68ECD9,
|
||||||
|
C6A76CB2F3B5,
|
||||||
|
E3AD9E9BA5D4,
|
||||||
|
6C9EC046C1A4,
|
||||||
|
#ROC HIGHSCHOOL ACCESSCARD
|
||||||
|
A0A1A2A3A4A5,
|
||||||
|
B021669B44BB,
|
||||||
|
A0A1A2A3A4A5,
|
||||||
|
B18CDCDE52B7,
|
||||||
|
A22647F422AE,
|
||||||
|
B268F7C9CA63,
|
||||||
|
A37A30004AC9,
|
||||||
|
B3630C9F11C8,
|
||||||
|
A4CDFF3B1848,
|
||||||
|
B42C4DFD7A90,
|
||||||
|
A541538F1416,
|
||||||
|
B5F454568271,
|
||||||
|
A6C028A12FBB,
|
||||||
|
B6323F550F54,
|
||||||
|
A7D71AC06DC2,
|
||||||
|
B7C344A36D88,
|
||||||
|
A844F4F52385,
|
||||||
|
B8457ACC5F5D,
|
||||||
|
A9A4045DCE77,
|
||||||
|
B9B8B7B6B5B3,
|
||||||
|
AA4D051954AC,
|
||||||
|
BA729428E808,
|
||||||
|
AB28A44AD5F5,
|
||||||
|
BB320A757099,
|
||||||
|
AC45AD2D620D,
|
||||||
|
BCF5A6B5E13F,
|
||||||
|
AD5645062534,
|
||||||
|
BDF837787A71,
|
||||||
|
AE43F36C1A9A,
|
||||||
|
BE7C4F6C7A9A,
|
||||||
|
5EC7938F140A,
|
||||||
|
82D58AA49CCB,
|
||||||
|
#MELONCARD
|
||||||
|
323334353637,
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue