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

fix GetHF14AMfU_Type for MFUL types with RandomID activated

Browse source
This commit is contained in:
Philippe Teuwen 2025-04-11 08:19:40 +02:00
commit dfc40a2ea3
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
client/src/cmdhfmfu.c
View file

@ -2021,12 +2021,12 @@ uint64_t GetHF14AMfU_Type(void) {
return MFU_TT_UL_ERROR; return MFU_TT_UL_ERROR;
// Ultralight - ATQA / SAK // Ultralight - ATQA / SAK
if (card.atqa[1] != 0x00 || card.atqa[0] != 0x44 || card.sak != 0x00) { if (card.atqa[1] != 0x00 || card.sak != 0x00) {
//PrintAndLogEx(NORMAL, "Tag is not Ultralight | NTAG | MY-D |ST25TN [ATQA: %02X %02X SAK: %02X]\n", card.atqa[1], card.atqa[0], card.sak); //PrintAndLogEx(NORMAL, "Tag is not Ultralight | NTAG | MY-D |ST25TN [ATQA: %02X %02X SAK: %02X]\n", card.atqa[1], card.atqa[0], card.sak);
DropField(); DropField();
return MFU_TT_UL_ERROR; return MFU_TT_UL_ERROR;
} }
if (card.uid[0] == 0x02) { if ((card.uid[0] == 0x02) && (card.atqa[0] == 0x44)) {
// ST25TN // ST25TN
// read SYSBLOCK // read SYSBLOCK
uint8_t data[4] = {0x00}; uint8_t data[4] = {0x00};
@ -2048,7 +2048,7 @@ uint64_t GetHF14AMfU_Type(void) {
} }
} }
} else if (card.uid[0] == 0x05) { } else if ((card.uid[0] == 0x05) && (card.atqa[0] == 0x44)){
// Infineon MY-D tests Exam high nibble // Infineon MY-D tests Exam high nibble
DropField(); DropField();
uint8_t nib = (card.uid[1] & 0xf0) >> 4; uint8_t nib = (card.uid[1] & 0xf0) >> 4;
@ -2069,7 +2069,7 @@ uint64_t GetHF14AMfU_Type(void) {
} }
} else { } else {
// Note that SAK might be 0x44 but also e.g. 0x04 for cards in Random ID mode
uint8_t version[10] = {0x00}; uint8_t version[10] = {0x00};
int len = ulev1_getVersion(version, sizeof(version)); int len = ulev1_getVersion(version, sizeof(version));
DropField(); DropField();
@ -2710,8 +2710,9 @@ static int CmdHF14AMfUWrBl(const char *Cmd) {
// starting with getting tagtype // starting with getting tagtype
uint64_t tagtype = GetHF14AMfU_Type(); uint64_t tagtype = GetHF14AMfU_Type();
if (tagtype == MFU_TT_UL_ERROR) if (tagtype == MFU_TT_UL_ERROR) {
return PM3_ESOFT; return PM3_ESOFT;
}
uint8_t maxblockno = 0; uint8_t maxblockno = 0;
for (uint8_t idx = 1; idx < ARRAYLEN(UL_TYPES_ARRAY); idx++) { for (uint8_t idx = 1; idx < ARRAYLEN(UL_TYPES_ARRAY); idx++) {