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

Changed createKeyDump to a less generic name (createMfcKeyDump).

Browse source
This commit is contained in:
Matthias Konrath 2019-08-26 14:29:21 +02:00
parent 2edee59837
commit 236c2eb1d0
3 changed files with 5 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
client/cmdhfmf.c
View file

@ -2059,7 +2059,7 @@ static int CmdHF14AMfAutoPWN(const char *Cmd) {
// Transfere the found keys to the simulator and dump the keys and card data
PrintAndLogEx(NORMAL, "");
PrintAndLogEx(INFO, "Dumping the keys:");
createKeyDump(sectors_cnt, e_sector, GenerateFilename("hf-mf-", "-key.bin"));
createMfcKeyDump(sectors_cnt, e_sector, GenerateFilename("hf-mf-", "-key.bin"));
PrintAndLogEx(SUCCESS, "Transfering the found keys to the simulator memory (Cmd Error: 04 can occour, but this shouldn't be a problem)");
for (current_sector_i=0; current_sector_i < sectors_cnt; current_sector_i++) {
@ -2352,7 +2352,7 @@ out:
if (createDumpFile) {
fptr = GenerateFilename("hf-mf-", "-key.bin");
createKeyDump(sectorsCnt, e_sector, fptr);
createMfcKeyDump(sectorsCnt, e_sector, fptr);
}
}
@ -2378,7 +2378,6 @@ static int CmdHF14AMfChk(const char *Cmd) {
uint8_t keyType = 0;
uint32_t keyitems = ARRAYLEN(g_mifare_default_keys);
uint64_t key64 = 0;
uint8_t tempkey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
char *fptr;
int clen = 0;
int transferToEml = 0;
@ -2633,31 +2632,7 @@ out:
if (createDumpFile) {
fptr = GenerateFilename("hf-mf-", "-key.bin");
if (fptr == NULL) {
free(keyBlock);
free(e_sector);
return PM3_EFILE;
}
FILE *fkeys = fopen(fptr, "wb");
if (fkeys == NULL) {
PrintAndLogEx(WARNING, "Could not create file " _YELLOW_("%s"), fptr);
free(keyBlock);
free(e_sector);
return PM3_EFILE;
}
PrintAndLogEx(INFO, "Printing keys to binary file " _YELLOW_("%s")"...", fptr);
for (i = 0; i < SectorsCnt; i++) {
num_to_bytes(e_sector[i].Key[0], 6, tempkey);
fwrite(tempkey, 1, 6, fkeys);
}
for (i = 0; i < SectorsCnt; i++) {
num_to_bytes(e_sector[i].Key[1], 6, tempkey);
fwrite(tempkey, 1, 6, fkeys);
}
fclose(fkeys);
PrintAndLogEx(SUCCESS, "Found keys have been dumped to file " _YELLOW_("%s")". 0xffffffffffff has been inserted for unknown keys.", fptr);
createMfcKeyDump(SectorsCnt, e_sector, fptr);
}
free(keyBlock);

2
client/fileutils.c
View file

@ -293,7 +293,7 @@ out:
return retval;
}
int createKeyDump(uint8_t sectorsCnt, sector_t *e_sector, char* fptr) {
int createMfcKeyDump(uint8_t sectorsCnt, sector_t *e_sector, char* fptr) {
uint8_t tmpKey[6] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
int i;

2
client/fileutils.h
View file

@ -112,7 +112,7 @@ int saveFileJSON(const char *preferredName, JSONFileType ftype, uint8_t *data, s
* @param fptr string pointer to the filename
* @return 0 for ok, 1 for failz
*/
int createKeyDump(uint8_t sectorsCnt, sector_t *e_sector, char* fptr);
int createMfcKeyDump(uint8_t sectorsCnt, sector_t *e_sector, char* fptr);
/** STUB
* @brief Utility function to load data from a binary file. This method takes a preferred name.