dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: several calls to nonce2key/nonce2key_ex has problems with not clearing up memory pointers laying around.

Browse Source 
Still exists problem which needs to be dealt with.
This commit is contained in:
iceman1001
2016-10-29 22:12:38 +02:00
parent 60c33f7aa8
commit 5e14319d2c
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
client/nonce2key/nonce2key.c
View File

@@ -150,6 +150,7 @@ int nonce2key_ex(uint8_t blockno, uint8_t keytype, uint32_t uid, uint32_t nt, ui
return 0; return 0;
} }
uint8_t retval = 1;
// Validate all key candidates with testing each of them with mfCheckKeys // Validate all key candidates with testing each of them with mfCheckKeys
uint8_t keyBlock[6] = {0,0,0,0,0,0}; uint8_t keyBlock[6] = {0,0,0,0,0,0};
uint64_t key64; uint64_t key64;
@@ -159,13 +160,16 @@ int nonce2key_ex(uint8_t blockno, uint8_t keytype, uint32_t uid, uint32_t nt, ui
key64 = 0; key64 = 0;
if (!mfCheckKeys(blockno, keytype, false, 1, keyBlock, &key64)) { if (!mfCheckKeys(blockno, keytype, false, 1, keyBlock, &key64)) {
*key = key64; *key = key64;
free(last_keylist); retval = 0;
last_keylist = NULL; goto out;
free(state);
return 0;
} }
} }
return 1;
out:
free(last_keylist);
last_keylist = NULL;
free(state);
return retval;
} }
// 32 bit recover key from 2 nonces // 32 bit recover key from 2 nonces