rfidrig/ChameleonMini
0
0
Fork 0
mirror of https://github.com/RfidResearchGroup/ChameleonMini.git synced 2026-05-12 11:20:37 -07:00
Code Issues Packages Projects Releases Wiki Activity

removed UL C and UL EV1 identification as it breaks the clone process for MFU

Browse Source
This commit is contained in:
Georg
2018-01-25 10:33:03 +01:00
parent c0c14899c3
commit 254a6eb688
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Firmware/Chameleon-Mini/Application/Reader14443A.c
+6 -6
View File
@@ -57,8 +57,8 @@ typedef enum {
CardType_NXP_MIFARE_Classic_1k,
CardType_NXP_MIFARE_Classic_4k,
CardType_NXP_MIFARE_Ultralight,
CardType_NXP_MIFARE_Ultralight_C,
CardType_NXP_MIFARE_Ultralight_EV1,
// CardType_NXP_MIFARE_Ultralight_C,
// CardType_NXP_MIFARE_Ultralight_EV1,
CardType_NXP_MIFARE_DESFire,
CardType_NXP_MIFARE_DESFire_EV1,
CardType_IBM_JCOP31,
@@ -92,8 +92,8 @@ static const CardIdentificationType PROGMEM CardIdentificationList[] = {
[CardType_NXP_MIFARE_Classic_1k] = { .ATQA=0x0004, .ATQARelevant=true, .SAK=0x08, .SAKRelevant=true, .ATSRelevant=false, .Manufacturer="NXP", .Type="MIFARE Classic 1k" },
[CardType_NXP_MIFARE_Classic_4k] = { .ATQA=0x0002, .ATQARelevant=true, .SAK=0x18, .SAKRelevant=true, .ATSRelevant=false, .Manufacturer="NXP", .Type="MIFARE Classic 4k" },
[CardType_NXP_MIFARE_Ultralight] = { .ATQA=0x0044, .ATQARelevant=true, .SAK=0x00, .SAKRelevant=true, .ATSRelevant=false, .Manufacturer="NXP", .Type="MIFARE Ultralight" },
[CardType_NXP_MIFARE_Ultralight_C] = { .ATQA=0x0044, .ATQARelevant=true, .SAK=0x00, .SAKRelevant=true, .ATSRelevant=false, .Manufacturer="NXP", .Type="MIFARE Ultralight C" },
[CardType_NXP_MIFARE_Ultralight_EV1] = { .ATQA=0x0044, .ATQARelevant=true, .SAK=0x00, .SAKRelevant=false, .ATSRelevant=false, .Manufacturer="NXP", .Type="MIFARE Ultralight EV1" },
// [CardType_NXP_MIFARE_Ultralight_C] = { .ATQA=0x0044, .ATQARelevant=true, .SAK=0x00, .SAKRelevant=true, .ATSRelevant=false, .Manufacturer="NXP", .Type="MIFARE Ultralight C" },
// [CardType_NXP_MIFARE_Ultralight_EV1] = { .ATQA=0x0044, .ATQARelevant=true, .SAK=0x00, .SAKRelevant=false, .ATSRelevant=false, .Manufacturer="NXP", .Type="MIFARE Ultralight EV1" },
// for the following two, setting ATSRelevant to true would cause checking the ATS value, but the NXP paper for distinguishing cards does not recommend this
[CardType_NXP_MIFARE_DESFire] = { .ATQA=0x0344, .ATQARelevant=true, .SAK=0x20, .SAKRelevant=true, .ATSRelevant=false, .ATSSize= 5, .ATS={0x75, 0x77, 0x81, 0x02, 0x80}, .Manufacturer="NXP", .Type="MIFARE DESFire" },
[CardType_NXP_MIFARE_DESFire_EV1] = { .ATQA=0x0344, .ATQARelevant=true, .SAK=0x20, .SAKRelevant=true, .ATSRelevant=false, .ATSSize= 5, .ATS={0x75, 0x77, 0x81, 0x02, 0x80}, .Manufacturer="NXP", .Type="MIFARE DESFire EV1" },
@@ -485,7 +485,7 @@ static bool Identify(uint8_t *Buffer, uint16_t *BitCount)
CardCandidatesIdx = 0;
}
break;
#if 0
case STATE_UL_C_AUTH:
if (*BitCount == 0)
{
@@ -509,7 +509,7 @@ static bool Identify(uint8_t *Buffer, uint16_t *BitCount)
CardCandidatesIdx = 1;
CardCandidates[0] = CardType_NXP_MIFARE_Ultralight_EV1;
break;
#endif
default:
break;
}