RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-14 03:03:14 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fixes to Mifare nested function...

Browse source
This commit is contained in:
caioxmag 2011-09-01 08:13:18 +00:00
parent 5ff9150e3b
commit 2115626711
1 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
client/cmdhfmf.c
View file

@ -467,6 +467,8 @@ int CmdHF14AMfNested(const char *Cmd)
int createDumpFile = 0; int createDumpFile = 0;
FILE *fkeys; FILE *fkeys;
uint8_t standart[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
char cmdp, ctmp; char cmdp, ctmp;
@ -519,10 +521,12 @@ int CmdHF14AMfNested(const char *Cmd)
} }
ctmp = param_getchar(Cmd, 4); ctmp = param_getchar(Cmd, 4);
if (ctmp == 't' || ctmp == 'T') transferToEml = 1; if (ctmp == 't' || ctmp == 'T') transferToEml = 1;
else if (ctmp == 'd' || ctmp == 'D') createDumpFile = 1;
ctmp = param_getchar(Cmd, 6); ctmp = param_getchar(Cmd, 6);
transferToEml |= (ctmp == 't' || ctmp == 'T'); transferToEml |= (ctmp == 't' || ctmp == 'T');
createDumpFile |= (ctmp == 'd' || ctmp == 'D'); transferToEml |= (ctmp == 'd' || ctmp == 'D');
PrintAndLog("--block no:%02x key type:%02x key:%s etrans:%d", blockNo, keyType, sprint_hex(key, 6), transferToEml); PrintAndLog("--block no:%02x key type:%02x key:%s etrans:%d", blockNo, keyType, sprint_hex(key, 6), transferToEml);
if (cmdp == 'o') if (cmdp == 'o')
@ -558,8 +562,8 @@ int CmdHF14AMfNested(const char *Cmd)
} else { } else {
PrintAndLog("No valid key found"); PrintAndLog("No valid key found");
} }
} else // ------------------------------------ multiple sectors working }
{ else { // ------------------------------------ multiple sectors working
blDiff = blockNo % 4; blDiff = blockNo % 4;
PrintAndLog("Block shift=%d", blDiff); PrintAndLog("Block shift=%d", blDiff);
e_sector = calloc(SectorsCnt, sizeof(sector)); e_sector = calloc(SectorsCnt, sizeof(sector));
@ -587,7 +591,6 @@ int CmdHF14AMfNested(const char *Cmd)
} }
} }
// nested sectors // nested sectors
iterations = 0; iterations = 0;
PrintAndLog("nested..."); PrintAndLog("nested...");
@ -634,17 +637,31 @@ int CmdHF14AMfNested(const char *Cmd)
} }
} }
// Create dump file
if (createDumpFile) { if (createDumpFile) {
if ((fkeys = fopen("dumpkeys.bin","wb")) == NULL) { if ((fkeys = fopen("dumpkeys.bin","wb")) == NULL) {
PrintAndLog("Could not create file keys.bin"); PrintAndLog("Could not create file keys.bin");
free(e_sector); free(e_sector);
return 1; return 1;
} }
PrintAndLog("Printing keys to bynary file dumpkeys.bin...");
for(i=0; i<16; i++) { for(i=0; i<16; i++) {
fwrite ( e_sector[i].Key, sizeof(e_sector[i].Key[0]), 1, fkeys ); if (e_sector[i].foundKey[0]){
num_to_bytes(e_sector[i].Key[0], 6, tempkey);
fwrite ( tempkey, 1, 6, fkeys );
}
else{
fwrite ( &standart, 1, 6, fkeys );
}
} }
for(i=0; i<16; i++) { for(i=0; i<16; i++) {
fwrite ( e_sector[i].Key, sizeof(e_sector[i].Key[1]), 1, fkeys ); if (e_sector[i].foundKey[1]){
num_to_bytes(e_sector[i].Key[1], 6, tempkey);
fwrite ( tempkey, 1, 6, fkeys );
}
else{
fwrite ( &standart, 1, 6, fkeys );
}
} }
fclose(fkeys); fclose(fkeys);
} }