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

Merge pull request #2011 from kormax/more-ecp-annotations

Browse source 
Update aidlist, add new ECP annotation
This commit is contained in:
Iceman 2023-06-22 18:15:14 +02:00 • committed by GitHub
commit 62aefa6d27
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 97 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

106
client/resources/aidlist.json
View file

@ -2255,13 +2255,21 @@
"Description": "Student ID cards", "Description": "Student ID cards",
"Type": "identity" "Type": "identity"
}, },
{
"AID": "D2760000254D010200",
"Vendor": "Zentraler Kreditausschuss (ZKA)",
"Country": "Germany",
"Name": "Girocard Jugendschutz",
"Description": "Age verification",
"Type": "identity"
},
{ {
"AID": "A000000809434343444B467631", "AID": "A000000809434343444B467631",
"Vendor": "Car Connectivity Consortium (CCC)", "Vendor": "Car Connectivity Consortium (CCC)",
"Country": "", "Country": "",
"Name": "Digital Car Key Framework", "Name": "Digital Car Key Framework",
"Description": "Used during key provisioning and configuration", "Description": "Used during key provisioning and configuration",
"Type": "access" "Type": ""
}, },
{ {
"AID": "A000000809434343444B417631", "AID": "A000000809434343444B417631",
@ -2295,13 +2303,69 @@
"Description": "AID prefix used by MIFARE 2GO-based cards", "Description": "AID prefix used by MIFARE 2GO-based cards",
"Type": "" "Type": ""
}, },
{
"AID": "A00000039656434103F1216000000000",
"Vendor": "LV Monorail",
"Country": "United States",
"Name": "Las Vegas Monorail",
"Description": "",
"Type": "transport"
},
{
"AID": "A00000039656434103F8852200000000",
"Vendor": "Ubian",
"Country": "Slovakia",
"Name": "Ubian digital transit card",
"Description": "DESFire-based virtual transit card",
"Type": "transport"
},
{
"AID": "DE5C0D1F1CADA5",
"Vendor": "CRTM",
"Country": "Spain",
"Name": "Madrid transit card",
"Description": "DESFire-based transit card",
"Type": "transport"
},
{
"AID": "A00000F21100",
"Vendor": "PTV",
"Country": "Australia",
"Name": "Myki transit card",
"Description": "DESFire-based transit card",
"Type": "transport"
},
{
"AID": "637001ff4c41",
"Vendor": "Cubic",
"Country": "United States",
"Name": "LA Tap",
"Description": "DESFire-based transit card (ASCII cp\\x01\\xffLA)",
"Type": "transport"
},
{
"AID": "637001ff574d415441",
"Vendor": "Cubic",
"Country": "United States",
"Name": "Smart Trip",
"Description": "DESFire-based transit card (ASCII cp\\x01\\xffWMATA)",
"Type": "transport"
},
{
"AID": "637001ff434c4950504552",
"Vendor": "Cubic",
"Country": "United States",
"Name": "Clipper",
"Description": "DESFire-based transit card (ASCII cp\\x01\\xffCLIPPER)",
"Type": "transport"
},
{ {
"AID": "A0000002164954534F2D31", "AID": "A0000002164954534F2D31",
"Vendor": "ITSO", "Vendor": "ITSO",
"Country": "United Kingdom", "Country": "United Kingdom",
"Name": "ITSO CMD2", "Name": "ITSO CMD2",
"Description": "AID used by ITSO for smartcard/phone-based transit cards", "Description": "AID used by ITSO for smartcard/phone-based transit cards",
"Type": "transit" "Type": "transport"
}, },
{ {
"AID": "A000000632010105", "AID": "A000000632010105",
@ -2309,22 +2373,38 @@
"Country": "China", "Country": "China",
"Name": "China T-Union", "Name": "China T-Union",
"Description": "Universal transit card used by many big public transit operators", "Description": "Universal transit card used by many big public transit operators",
"Type": "transit" "Type": "transport"
},
{
"AID": "D2760000254D010200",
"Vendor": "Zentraler Kreditausschuss (ZKA)",
"Country": "Germany",
"Name": "Girocard Jugendschutz",
"Description": "Age verification",
"Type": ""
}, },
{ {
"AID": "A00000000491", "AID": "A00000000491",
"Vendor": "MasterCard International", "Vendor": "MasterCard International",
"Country": "", "Country": "",
"Name": "Mastercard Private Label Transit", "Name": "Mastercard Private Label Transit",
"Description": "AID prefix used by transit cards that use private label mastercards (E.g. Ventra and HOP)", "Description": "AID prefix used by transit cards that use private label mastercard",
"Type": "transit" "Type": "transport"
},
{
"AID": "A0000000049100",
"Vendor": "MasterCard International",
"Country": "United States",
"Name": "HOP Fastpass",
"Description": "",
"Type": "transport"
},
{
"AID": "A0000000049101",
"Vendor": "MasterCard International",
"Country": "United States",
"Name": "Ventra",
"Description": "",
"Type": "transport"
},
{
"AID": "A000000858044F53452E4348",
"Vendor": "Apple",
"Country": "",
"Name": "AirDrop connection negotiation",
"Description": "Used by NFC-based AirDrop negotiation added in IOS17",
"Type": ""
} }
] ]

5
client/src/cmdhflist.c
View file

@ -189,7 +189,7 @@ int applyIso14443a(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize, bool i
if (cmd[1] == 0x01 && cmdsize == 7) { if (cmd[1] == 0x01 && cmdsize == 7) {
snprintf(exp, size, "ECP1"); snprintf(exp, size, "ECP1");
return PM3_SUCCESS; return PM3_SUCCESS;
} else if (cmd[1] == 0x02 && cmdsize == (cmd[2] & 0x0f) + 7) { } else if (cmd[1] == 0x02 && cmdsize == (cmd[2] & 0x0F) + 7) {
// Byte 3 is the reader type // Byte 3 is the reader type
switch (cmd[3]) { switch (cmd[3]) {
case 0x01: case 0x01:
@ -201,6 +201,9 @@ int applyIso14443a(char *exp, size_t size, uint8_t *cmd, uint8_t cmdsize, bool i
case 0x03: case 0x03:
snprintf(exp, size, "ECP2 (Identity)"); snprintf(exp, size, "ECP2 (Identity)");
break; break;
case 0x05:
snprintf(exp, size, "ECP2 (AirDrop)");
break;
default: default:
snprintf(exp, size, "ECP2"); snprintf(exp, size, "ECP2");
break; break;