DeforaNetworks/proxmark3
3
0
Fork 0
Code Releases Activity

Merge pull request #480 from pwpiwi/fix_nested

Browse Source 
fix memory overflow in hf mf nested (issue #479)
This commit is contained in:
marshmellow42
2017-11-13 09:42:56 -05:00
committed by GitHub
parent c3511781a1 e537c3e894
commit aa264aba1d
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/cmdhfmf.c
View File

@@ -527,7 +527,6 @@ int CmdHF14AMfRestore(const char *Cmd)
//---------------------------------------------- //----------------------------------------------
// Nested // Nested
//---------------------------------------------- //----------------------------------------------
# define NESTED_KEY_COUNT 15
static void parseParamTDS(const char *Cmd, const uint8_t indx, bool *paramT, bool *paramD, uint8_t *timeout) { static void parseParamTDS(const char *Cmd, const uint8_t indx, bool *paramT, bool *paramD, uint8_t *timeout) {
char ctmp3[3] = {0}; char ctmp3[3] = {0};
@@ -563,7 +562,7 @@ int CmdHF14AMfNested(const char *Cmd)
uint8_t trgKeyType = 0; uint8_t trgKeyType = 0;
uint8_t SectorsCnt = 0; uint8_t SectorsCnt = 0;
uint8_t key[6] = {0, 0, 0, 0, 0, 0}; uint8_t key[6] = {0, 0, 0, 0, 0, 0};
uint8_t keyBlock[NESTED_KEY_COUNT * 6]; uint8_t keyBlock[MifareDefaultKeysSize * 6];
uint64_t key64 = 0; uint64_t key64 = 0;
// timeout in units. (ms * 106)/10 or us*0.0106 // timeout in units. (ms * 106)/10 or us*0.0106
uint8_t btimeout14a = MF_CHKKEYS_DEFTIMEOUT; // fast by default uint8_t btimeout14a = MF_CHKKEYS_DEFTIMEOUT; // fast by default
@@ -713,7 +712,7 @@ int CmdHF14AMfNested(const char *Cmd)
} }
PrintAndLog("Testing known keys. Sector count=%d", SectorsCnt); PrintAndLog("Testing known keys. Sector count=%d", SectorsCnt);
mfCheckKeysSec(SectorsCnt, 2, btimeout14a, true, NESTED_KEY_COUNT, keyBlock, e_sector); mfCheckKeysSec(SectorsCnt, 2, btimeout14a, true, MifareDefaultKeysSize, keyBlock, e_sector);
// get known key from array // get known key from array
bool keyFound = false; bool keyFound = false;