rework Mifare simulation flags

This commit is contained in:
Philippe Teuwen committed 2024-10-19 20:34:40 +02:00
1 parent e1fa9374d0
commit 838e0adfa7
17 files changed
+184 -214

No files matched your search

+20 -36
View File
@@ -830,20 +830,11 @@ int CmdHF14ASim(const char *Cmd) {
bool useUIDfromEML = true;
if (uid_len > 0) {
switch (uid_len) {
case 10:
flags |= FLAG_10B_UID_IN_DATA;
break;
case 7:
flags |= FLAG_7B_UID_IN_DATA;
break;
case 4:
flags |= FLAG_4B_UID_IN_DATA;
break;
default:
PrintAndLogEx(ERR, "Please specify a 4, 7, or 10 byte UID");
CLIParserFree(ctx);
return PM3_EINVARG;
FLAG_SET_UID_IN_DATA(flags, uid_len);
if (IS_FLAG_UID_IN_EMUL(flags)) {
PrintAndLogEx(ERR, "Please specify a 4, 7, or 10 byte UID");
CLIParserFree(ctx);
return PM3_EINVARG;
}
PrintAndLogEx(SUCCESS, "Emulating " _YELLOW_("ISO/IEC 14443 type A tag")" with " _GREEN_("%d byte UID (%s)"), uid_len, sprint_hex(uid, uid_len));
useUIDfromEML = false;
@@ -866,7 +857,7 @@ int CmdHF14ASim(const char *Cmd) {
}
if (useUIDfromEML) {
flags |= FLAG_UID_IN_EMUL;
FLAG_SET_UID_IN_EMUL(flags);
}
struct {
@@ -1660,12 +1651,14 @@ static int CmdHF14AAntiFuzz(const char *Cmd) {
struct {
uint8_t flag;
} PACKED param;
param.flag = FLAG_4B_UID_IN_DATA;
if (arg_get_lit(ctx, 2))
param.flag = FLAG_7B_UID_IN_DATA;
if (arg_get_lit(ctx, 3))
param.flag = FLAG_10B_UID_IN_DATA;
param.flag = 0;
FLAG_SET_UID_IN_DATA(param.flag, 4);
if (arg_get_lit(ctx, 2)) {
FLAG_SET_UID_IN_DATA(param.flag, 7);
}
if (arg_get_lit(ctx, 3)) {
FLAG_SET_UID_IN_DATA(param.flag, 10);
}
CLIParserFree(ctx);
clearCommandBuffer();
@@ -3725,20 +3718,11 @@ int CmdHF14AAIDSim(const char *Cmd) {
bool useUIDfromEML = true;
if (uid_len > 0) {
switch (uid_len) {
case 10:
flags |= FLAG_10B_UID_IN_DATA;
break;
case 7:
flags |= FLAG_7B_UID_IN_DATA;
break;
case 4:
flags |= FLAG_4B_UID_IN_DATA;
break;
default:
PrintAndLogEx(ERR, "Please specify a 4, 7, or 10 byte UID");
CLIParserFree(ctx);
return PM3_EINVARG;
FLAG_SET_UID_IN_DATA(flags, uid_len);
if (IS_FLAG_UID_IN_EMUL(flags)) {
PrintAndLogEx(ERR, "Please specify a 4, 7, or 10 byte UID");
CLIParserFree(ctx);
return PM3_EINVARG;
}
PrintAndLogEx(SUCCESS, "Emulating " _YELLOW_("ISO/IEC 14443 type A tag")" with " _GREEN_("%d byte UID (%s)"), uid_len, sprint_hex(uid, uid_len));
useUIDfromEML = false;
@@ -3757,7 +3741,7 @@ int CmdHF14AAIDSim(const char *Cmd) {
}
if (useUIDfromEML) {
flags |= FLAG_UID_IN_EMUL;
FLAG_SET_UID_IN_EMUL(flags);
}
struct {
+2 -1
View File
@@ -565,7 +565,8 @@ static int CmdHF14AJookiSim(const char *Cmd) {
// NTAG, 7 byte UID in eloaded data.
payload.tagtype = 7;
payload.flags = FLAG_UID_IN_EMUL;
payload.flags = 0;
FLAG_SET_UID_IN_EMUL(payload.flags);
payload.exitAfter = 0;
memcpy(payload.uid, uid, sizeof(uid));
+15 -31
View File
@@ -4129,25 +4129,15 @@ static int CmdHF14AMfSim(const char *Cmd) {
uint8_t uid[10] = {0};
CLIGetHexWithReturn(ctx, 1, uid, &uidlen);
char uidsize[8] = {0};
char uidsize[9] = {0};
if (uidlen > 0) {
switch (uidlen) {
case 10:
flags |= FLAG_10B_UID_IN_DATA;
snprintf(uidsize, sizeof(uidsize), "10 byte");
break;
case 7:
flags |= FLAG_7B_UID_IN_DATA;
snprintf(uidsize, sizeof(uidsize), "7 byte");
break;
case 4:
flags |= FLAG_4B_UID_IN_DATA;
snprintf(uidsize, sizeof(uidsize), "4 byte");
break;
default:
PrintAndLogEx(WARNING, "Invalid parameter for UID");
CLIParserFree(ctx);
return PM3_EINVARG;
FLAG_SET_UID_IN_DATA(flags, uidlen);
if (IS_FLAG_UID_IN_EMUL(flags)) {
PrintAndLogEx(WARNING, "Invalid parameter for UID");
CLIParserFree(ctx);
return PM3_EINVARG;
} else {
snprintf(uidsize, sizeof(uidsize), "%i bytes", uidlen);
}
}
@@ -4193,7 +4183,7 @@ static int CmdHF14AMfSim(const char *Cmd) {
PrintAndLogEx(WARNING, "Wrong ATQA length");
return PM3_EINVARG;
}
flags |= FLAG_FORCED_ATQA;
flags |= FLAG_ATQA_IN_DATA;
}
if (saklen > 0) {
@@ -4201,12 +4191,7 @@ static int CmdHF14AMfSim(const char *Cmd) {
PrintAndLogEx(WARNING, "Wrong SAK length");
return PM3_EINVARG;
}
flags |= FLAG_FORCED_SAK;
}
// Use UID, SAK, ATQA from EMUL, if uid not defined
if ((flags & (FLAG_4B_UID_IN_DATA | FLAG_7B_UID_IN_DATA | FLAG_10B_UID_IN_DATA)) == 0) {
flags |= FLAG_UID_IN_EMUL;
flags |= FLAG_SAK_IN_DATA;
}
size_t k_sectors_cnt = MIFARE_4K_MAXSECTOR;
@@ -4218,19 +4203,19 @@ static int CmdHF14AMfSim(const char *Cmd) {
}
if (m0) {
flags |= FLAG_MF_MINI;
FLAG_SET_MF_SIZE(flags, MIFARE_MINI_MAX_BYTES);
snprintf(csize, sizeof(csize), "MINI");
k_sectors_cnt = MIFARE_MINI_MAXSECTOR;
} else if (m1) {
flags |= FLAG_MF_1K;
FLAG_SET_MF_SIZE(flags, MIFARE_1K_MAX_BYTES);
snprintf(csize, sizeof(csize), "1K");
k_sectors_cnt = MIFARE_1K_MAXSECTOR;
} else if (m2) {
flags |= FLAG_MF_2K;
FLAG_SET_MF_SIZE(flags, MIFARE_2K_MAX_BYTES);
snprintf(csize, sizeof(csize), "2K with RATS");
k_sectors_cnt = MIFARE_2K_MAXSECTOR;
} else if (m4) {
flags |= FLAG_MF_4K;
FLAG_SET_MF_SIZE(flags, MIFARE_4K_MAX_BYTES);
snprintf(csize, sizeof(csize), "4K");
k_sectors_cnt = MIFARE_4K_MAXSECTOR;
} else {
@@ -4262,9 +4247,8 @@ static int CmdHF14AMfSim(const char *Cmd) {
, (uidlen == 0) ? "n/a" : sprint_hex(uid, uidlen)
);
PrintAndLogEx(INFO, "Options [ numreads: %d, flags: %d (0x%02x) ]"
PrintAndLogEx(INFO, "Options [ numreads: %d, flags: 0x%04x ]"
, exitAfterNReads
, flags
, flags);
struct {