github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 13:53:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove invalid change and duplicate keys

Browse source
This commit is contained in:
PhaseLoop 2024-01-16 21:30:02 +00:00
commit 1e1f1fcae4
2 changed files with 8 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
client/dictionaries/mfc_default_keys.dic
View file

@ -2340,7 +2340,6 @@ D60DE9436219
# ATM Area de Girona, spanish transport card # ATM Area de Girona, spanish transport card
A00000000000
A01000000000 A01000000000
A02000000000 A02000000000
A03000000000 A03000000000
@ -2357,7 +2356,6 @@ A13000000000
A14000000000 A14000000000
A15000000000 A15000000000
B00000000000
B01000000000 B01000000000
B02000000000 B02000000000
B03000000000 B03000000000
@ -2374,8 +2372,3 @@ B13000000000
B14000000000 B14000000000
B15000000000 B15000000000
# TAM - Transporte Alicante Metropolitano (spanish transport card)
# Sectors 9-15
C0C1C2C3C4C5
B0B1B2B3B4B5

18
client/src/cmdhfmf.c
View file

@ -3389,7 +3389,6 @@ static int CmdHF14AMfSmartBrute(const char *Cmd) {
arg_lit0(NULL, "4k", "MIFARE Classic 4k / S70"), arg_lit0(NULL, "4k", "MIFARE Classic 4k / S70"),
arg_lit0(NULL, "emu", "Fill simulator keys from found keys"), arg_lit0(NULL, "emu", "Fill simulator keys from found keys"),
arg_lit0(NULL, "dump", "Dump found keys to binary file"), arg_lit0(NULL, "dump", "Dump found keys to binary file"),
arg_lit0(NULL, "mem", "Use dictionary from flashmemory"),
arg_param_end arg_param_end
}; };
CLIExecWithReturn(ctx, Cmd, argtable, true); CLIExecWithReturn(ctx, Cmd, argtable, true);
@ -3402,7 +3401,6 @@ static int CmdHF14AMfSmartBrute(const char *Cmd) {
bool transferToEml = arg_get_lit(ctx, 6); bool transferToEml = arg_get_lit(ctx, 6);
bool createDumpFile = arg_get_lit(ctx, 7); bool createDumpFile = arg_get_lit(ctx, 7);
bool use_flashmemory = arg_get_lit(ctx, 8);
CLIParserFree(ctx); CLIParserFree(ctx);
@ -3531,13 +3529,6 @@ out:
printKeyTable(sectorsCnt, e_sector); printKeyTable(sectorsCnt, e_sector);
if (use_flashmemory && found_keys == (sectorsCnt << 1)) {
PrintAndLogEx(SUCCESS, "Card dumped as well. run " _YELLOW_("`%s %c`"),
"hf mf esave",
GetFormatFromSector(sectorsCnt)
);
}
if (transferToEml) { if (transferToEml) {
// fast push mode // fast push mode
g_conn.block_after_ACK = true; g_conn.block_after_ACK = true;
@ -3572,6 +3563,14 @@ out:
PrintAndLogEx(ERR, "Failed to save keys to file"); PrintAndLogEx(ERR, "Failed to save keys to file");
} }
free(fptr); free(fptr);
if (found_keys == (sectorsCnt << 1)) {
PrintAndLogEx(SUCCESS, "Card dumped as well. run " _YELLOW_("`%s %c`"),
"hf mf esave",
GetFormatFromSector(sectorsCnt)
);
}
} }
} }
@ -6209,7 +6208,6 @@ int CmdHFMFNDEFRead(const char *Cmd) {
} }
uint8_t ndefkey[6] = {0}; uint8_t ndefkey[6] = {0};
printf("%d", keylen)
memcpy(ndefkey, g_mifare_ndef_key, 6); memcpy(ndefkey, g_mifare_ndef_key, 6);
if (keylen == 6) { if (keylen == 6) {
memcpy(ndefkey, key, 6); memcpy(ndefkey, key, 6);