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

Merge pull request #9 from RfidResearchGroup/master

Browse source 
chg: in preparation for EV3
This commit is contained in:
Bjoern Kerler 2020-04-06 15:50:51 +02:00 • committed by GitHub
commit 5a3185db9a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
client/cmdhfmfdes.c
View file

@ -32,6 +32,7 @@ typedef enum {
MF3ICD40, MF3ICD40,
EV1, EV1,
EV2, EV2,
EV3,
LIGHT, LIGHT,
} desfire_cardtype_t; } desfire_cardtype_t;
@ -70,6 +71,8 @@ static desfire_cardtype_t getCardType(uint8_t major, uint8_t minor) {
return EV1; return EV1;
else if (major == 0x12 && minor == 0x00) else if (major == 0x12 && minor == 0x00)
return EV2; return EV2;
// else if (major == 0x13 && minor == 0x00)
// return EV3;
else if (major == 0x30 && minor == 0x00) else if (major == 0x30 && minor == 0x00)
return LIGHT; return LIGHT;
else else
@ -432,9 +435,11 @@ static int CmdHF14ADesInfo(const char *Cmd) {
if (major == 1 && minor == 3) if (major == 1 && minor == 3)
PrintAndLogEx(INFO, "\t1.3 - DESFire Ev1, Support extended APDU commands"); PrintAndLogEx(INFO, "\t1.3 - DESFire Ev1, Support extended APDU commands");
if (major == 1 && minor == 4) if (major == 1 && minor == 4)
PrintAndLogEx(INFO, "\t1.4 - DESFire Ev1, N/A information about this version. report to iceman!"); PrintAndLogEx(INFO, "\t1.4 - DESFire Ev1, N/A (report to iceman!)");
if (major == 2 && minor == 0) if (major == 2 && minor == 0)
PrintAndLogEx(INFO, "\t2.0 - DESFire Ev2, Originality check, proximity check"); PrintAndLogEx(INFO, "\t2.0 - DESFire Ev2, Originality check, proximity check");
// if (major == 3 && minor == 0)
// PrintAndLogEx(INFO, "\t3.0 - DESFire Ev3, Originality check, proximity check, badass");
if (major == 0 && minor == 2) if (major == 0 && minor == 2)
PrintAndLogEx(INFO, "\t0.2 - DESFire Light, Originality check, "); PrintAndLogEx(INFO, "\t0.2 - DESFire Light, Originality check, ");
@ -526,6 +531,8 @@ char *getVersionStr(uint8_t major, uint8_t minor) {
sprintf(retStr, "%x.%x ( " _YELLOW_("DESFire EV1") ")", major, minor); sprintf(retStr, "%x.%x ( " _YELLOW_("DESFire EV1") ")", major, minor);
else if (major == 0x12 && minor == 0x00) else if (major == 0x12 && minor == 0x00)
sprintf(retStr, "%x.%x ( " _YELLOW_("DESFire EV2") ")", major, minor); sprintf(retStr, "%x.%x ( " _YELLOW_("DESFire EV2") ")", major, minor);
// else if (major == 0x13 && minor == 0x00)
// sprintf(retStr, "%x.%x ( " _YELLOW_("DESFire EV3") ")", major, minor);
else if (major == 0x30 && minor == 0x00) else if (major == 0x30 && minor == 0x00)
sprintf(retStr, "%x.%x ( " _YELLOW_("DESFire Light") ")", major, minor); sprintf(retStr, "%x.%x ( " _YELLOW_("DESFire Light") ")", major, minor);
else else