crewID/libfreefare
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #138 from AlexandreFenyo/patch-2

Browse source 
support of a new ATS for DESFire EV1 on JCOP3
This commit is contained in:
Romain Tartière 2021-05-30 14:42:09 -10:00 committed by GitHub
commit c2b0cfa4b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libfreefare/mifare_desfire.c
View file

@ -271,19 +271,21 @@ le24toh(uint8_t data[3])
bool bool
mifare_desfire_taste(nfc_device *device, nfc_target target) mifare_desfire_taste(nfc_device *device, nfc_target target)
{ {
// We have two different ATS prefixes to // We have three different ATS prefixes to
// check for, standalone and JCOP. // check for, standalone, JCOP and JCOP3.
static const char STANDALONE_DESFIRE[] = { 0x75, 0x77, 0x81, 0x02}; static const char STANDALONE_DESFIRE[] = { 0x75, 0x77, 0x81, 0x02 };
static const char JCOP_DESFIRE[] = { 0x75, 0xf7, 0xb1, 0x02 }; static const char JCOP_DESFIRE[] = { 0x75, 0xf7, 0xb1, 0x02 };
static const char JCOP3_DESFIRE[] = { 0x78, 0x77, 0x71, 0x02 };
(void) device; (void) device;
return target.nm.nmt == NMT_ISO14443A && return target.nm.nmt == NMT_ISO14443A &&
target.nti.nai.btSak == 0x20 && target.nti.nai.btSak == 0x20 && ((
target.nti.nai.szAtsLen >= 5 && ( target.nti.nai.szAtsLen >= 5 && (
memcmp(target.nti.nai.abtAts, STANDALONE_DESFIRE, sizeof(STANDALONE_DESFIRE)) == 0 || memcmp(target.nti.nai.abtAts, STANDALONE_DESFIRE, sizeof(STANDALONE_DESFIRE)) == 0 ||
memcmp(target.nti.nai.abtAts, JCOP_DESFIRE, sizeof(JCOP_DESFIRE)) == 0 memcmp(target.nti.nai.abtAts, JCOP_DESFIRE, sizeof(JCOP_DESFIRE)) == 0))
); || (target.nti.nai.szAtsLen == 4 &&
memcmp(target.nti.nai.abtAts, JCOP3_DESFIRE, sizeof(JCOP3_DESFIRE)) == 0));
} }
/* /*