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

fix partial found keys

Browse source
This commit is contained in:
iceman1001 2023-12-12 11:48:10 +01:00
commit 20ca44c8b2
2 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
client/src/cmdhfmf.c
View file

@ -8905,6 +8905,7 @@ static int CmdHF14AMfInfo(const char *Cmd) {
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
PrintAndLogEx(INFO, "--- " _CYAN_("Keys Information")); PrintAndLogEx(INFO, "--- " _CYAN_("Keys Information"));
uint8_t fkey[MIFARE_KEY_SIZE] = {0}; uint8_t fkey[MIFARE_KEY_SIZE] = {0};
uint8_t fKeyType = 0xff; uint8_t fKeyType = 0xff;
@ -8924,7 +8925,7 @@ static int CmdHF14AMfInfo(const char *Cmd) {
} }
res = mfCheckKeys_fast(sectorsCnt, true, true, 1, keycnt, keyBlock, e_sector, false, verbose); res = mfCheckKeys_fast(sectorsCnt, true, true, 1, keycnt, keyBlock, e_sector, false, verbose);
if (res == PM3_SUCCESS) { if (res == PM3_SUCCESS || res == PM3_EPARTIAL) {
uint8_t blockdata[MFBLOCK_SIZE] = {0}; uint8_t blockdata[MFBLOCK_SIZE] = {0};
if (e_sector[0].foundKey[0]) { if (e_sector[0].foundKey[0]) {

27
client/src/mifare/mifarehost.c
View file

@ -270,16 +270,19 @@ int mfCheckKeys_fast(uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
foo = bytes_to_num(resp.data.asBytes + 480, 8); foo = bytes_to_num(resp.data.asBytes + 480, 8);
bar = (resp.data.asBytes[489] << 8 | resp.data.asBytes[488]); bar = (resp.data.asBytes[489] << 8 | resp.data.asBytes[488]);
for (uint8_t i = 0; i < 64; i++) for (uint8_t i = 0; i < 64; i++) {
arr[i] = (foo >> i) & 0x1; arr[i] = (foo >> i) & 0x1;
}
for (uint8_t i = 0; i < 16; i++) for (uint8_t i = 0; i < 16; i++) {
arr[i + 64] = (bar >> i) & 0x1; arr[i + 64] = (bar >> i) & 0x1;
}
// initialize storage for found keys // initialize storage for found keys
icesector_t *tmp = calloc(sectorsCnt, sizeof(icesector_t)); icesector_t *tmp = calloc(sectorsCnt, sizeof(icesector_t));
if (tmp == NULL) if (tmp == NULL) {
return PM3_EMALLOC; return PM3_EMALLOC;
}
memcpy(tmp, resp.data.asBytes, sectorsCnt * sizeof(icesector_t)); memcpy(tmp, resp.data.asBytes, sectorsCnt * sizeof(icesector_t));
@ -297,11 +300,20 @@ int mfCheckKeys_fast(uint8_t sectorsCnt, uint8_t firstChunk, uint8_t lastChunk,
} }
free(tmp); free(tmp);
if (curr_keys == sectorsCnt * 2) // if all keys where found
if (curr_keys == sectorsCnt * 2) {
return PM3_SUCCESS; return PM3_SUCCESS;
if (lastChunk) }
// if some keys was found
if (curr_keys > 0) {
return PM3_EPARTIAL;
}
if (lastChunk) {
return PM3_ESOFT; return PM3_ESOFT;
} }
}
return PM3_ESOFT; return PM3_ESOFT;
} }
@ -1360,7 +1372,6 @@ returns:
3 = has encrypted nonce 3 = has encrypted nonce
*/ */
int detect_classic_static_encrypted_nonce(uint8_t block_no, uint8_t key_type, uint8_t *key) { int detect_classic_static_encrypted_nonce(uint8_t block_no, uint8_t key_type, uint8_t *key) {
clearCommandBuffer(); clearCommandBuffer();
uint8_t cdata[1 + 1 + MIFARE_KEY_SIZE] = {0}; uint8_t cdata[1 + 1 + MIFARE_KEY_SIZE] = {0};
cdata[0] = block_no; cdata[0] = block_no;
@ -1370,9 +1381,9 @@ int detect_classic_static_encrypted_nonce(uint8_t block_no, uint8_t key_type, ui
PacketResponseNG resp; PacketResponseNG resp;
if (WaitForResponseTimeout(CMD_HF_MIFARE_STATIC_ENCRYPTED_NONCE, &resp, 1000)) { if (WaitForResponseTimeout(CMD_HF_MIFARE_STATIC_ENCRYPTED_NONCE, &resp, 1000)) {
if (resp.status == PM3_ESOFT) if (resp.status == PM3_ESOFT) {
return NONCE_FAIL; return NONCE_FAIL;
}
return resp.data.asBytes[0]; return resp.data.asBytes[0];
} }
return NONCE_FAIL; return NONCE_FAIL;