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

cleanup and fix shadowing var

Browse source
This commit is contained in:
iceman1001 2023-09-03 14:43:38 +02:00
parent 3e034e146a
commit 276bd29da9
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
armsrc/iso14443a.c
View file

@ -1276,21 +1276,15 @@ bool SimulateIso14443aInit(uint8_t tagType, uint16_t flags, uint8_t *data, tag_r
// EV1/NTAG, set PWD w AMIIBO algo if all zero. // EV1/NTAG, set PWD w AMIIBO algo if all zero.
if (tagType == 7) { if (tagType == 7) {
uint8_t pwd[4]; uint8_t pwd[4] = {0,0,0,0};
uint8_t gen_pwd[4]; uint8_t gen_pwd[4] = {0,0,0,0};
uint16_t start = (*pages - 1) * 4 + MFU_DUMP_PREFIX_LENGTH; emlGetMemBt(pwd, (*pages - 1) * 4 + MFU_DUMP_PREFIX_LENGTH, sizeof(pwd));
emlGetMemBt(pwd, start, sizeof(pwd)); emlGetMemBt(rPACK, (*pages) * 4 + MFU_DUMP_PREFIX_LENGTH, sizeof(rPACK));
Uint4byteToMemBe(gen_pwd, ul_ev1_pwdgenB(data)); Uint4byteToMemBe(gen_pwd, ul_ev1_pwdgenB(data));
if (memcmp(pwd, gen_pwd, sizeof(pwd)) == 0) { if (memcmp(pwd, gen_pwd, sizeof(pwd)) == 0) {
rPACK[0] = 0x80; rPACK[0] = 0x80;
rPACK[1] = 0x80; rPACK[1] = 0x80;
} else {
uint16_t start = (*pages) * 4 + MFU_DUMP_PREFIX_LENGTH;
emlGetMemBt(rPACK, start, sizeof(rPACK));
if (g_dbglevel >= DBG_DEBUG) {
Dbprintf("PACK loaded from memory: ");
Dbhexdump(4, rPACK, 0);
}
} }
} }