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

t55xx info: tag out of spec FSKa modulations in standard mode

Browse source
This commit is contained in:
Philippe Teuwen 2019-03-31 21:30:30 +02:00
commit d448549524
2 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
client/cmdlft55xx.c
View file

@ -1386,7 +1386,7 @@ int CmdT55xxInfo(const char *Cmd) {
PrintAndLogEx(NORMAL, " reserved : %d", resv); PrintAndLogEx(NORMAL, " reserved : %d", resv);
PrintAndLogEx(NORMAL, " Data bit rate : %s", GetBitRateStr(dbr, extend)); PrintAndLogEx(NORMAL, " Data bit rate : %s", GetBitRateStr(dbr, extend));
PrintAndLogEx(NORMAL, " eXtended mode : %s", (extend) ? _YELLOW_("Yes - Warning") : "No"); PrintAndLogEx(NORMAL, " eXtended mode : %s", (extend) ? _YELLOW_("Yes - Warning") : "No");
PrintAndLogEx(NORMAL, " Modulation : %s", GetModulationStr(datamod)); PrintAndLogEx(NORMAL, " Modulation : %s", GetModulationStr(datamod, extend));
PrintAndLogEx(NORMAL, " PSK clock frequency : %s", GetPskCfStr(pskcf, 0)); PrintAndLogEx(NORMAL, " PSK clock frequency : %s", GetPskCfStr(pskcf, 0));
PrintAndLogEx(NORMAL, " AOR - Answer on Request : %s", (aor) ? _GREEN_("Yes") : "No"); PrintAndLogEx(NORMAL, " AOR - Answer on Request : %s", (aor) ? _GREEN_("Yes") : "No");
PrintAndLogEx(NORMAL, " OTP - One Time Pad : %s", (otp) ? ((extend) ? _YELLOW_("Yes - Warning") : _RED_("Yes - Warning")) : "No"); PrintAndLogEx(NORMAL, " OTP - One Time Pad : %s", (otp) ? ((extend) ? _YELLOW_("Yes - Warning") : _RED_("Yes - Warning")) : "No");
@ -1533,7 +1533,7 @@ char *GetSaferStr(uint32_t id) {
return buf; return buf;
} }
char *GetModulationStr(uint32_t id) { char *GetModulationStr(uint32_t id, bool xmode) {
static char buf[60]; static char buf[60];
char *retStr = buf; char *retStr = buf;
@ -1557,10 +1557,10 @@ char *GetModulationStr(uint32_t id) {
snprintf(retStr, sizeof(buf), "%u - FSK 2 RF/8 RF/10", id); snprintf(retStr, sizeof(buf), "%u - FSK 2 RF/8 RF/10", id);
break; break;
case 6: case 6:
snprintf(retStr, sizeof(buf), "%u - FSK 1a RF/5 RF/8", id); snprintf(retStr, sizeof(buf), "%u - %s RF/5 RF/8", id, (xmode) ? "FSK 1a" : _YELLOW_("FSK 1a"));
break; break;
case 7: case 7:
snprintf(retStr, sizeof(buf), "%u - FSK 2a RF/10 RF/8", id); snprintf(retStr, sizeof(buf), "%u - %s RF/10 RF/8", id, (xmode) ? "FSK 2a" : _YELLOW_("FSK 2a"));
break; break;
case 8: case 8:
snprintf(retStr, sizeof(buf), "%u - Manchester", id); snprintf(retStr, sizeof(buf), "%u - Manchester", id);
@ -1568,11 +1568,8 @@ char *GetModulationStr(uint32_t id) {
case 16: case 16:
snprintf(retStr, sizeof(buf), "%u - Biphase", id); snprintf(retStr, sizeof(buf), "%u - Biphase", id);
break; break;
case 0x18: case 24:
snprintf(retStr, sizeof(buf), "%u - Biphase a - AKA Conditional Dephase Encoding(CDP)", id); snprintf(retStr, sizeof(buf), "%u - %s", id, (xmode) ? "Biphase a - AKA Conditional Dephase Encoding(CDP)" : _YELLOW_("Reserved"));
break;
case 17:
snprintf(retStr, sizeof(buf), "%u - " _YELLOW_("Reserved"), id);
break; break;
default: default:
snprintf(retStr, sizeof(buf), "0x%02X " _RED_("(Unknown)"), id); snprintf(retStr, sizeof(buf), "0x%02X " _RED_("(Unknown)"), id);

2
client/cmdlft55xx.h
View file

@ -153,7 +153,7 @@ char *GetPskCfStr(uint32_t id, bool q5);
char *GetBitRateStr(uint32_t id, bool xmode); char *GetBitRateStr(uint32_t id, bool xmode);
char *GetSaferStr(uint32_t id); char *GetSaferStr(uint32_t id);
char *GetQ5ModulationStr(uint32_t id); char *GetQ5ModulationStr(uint32_t id);
char *GetModulationStr(uint32_t id); char *GetModulationStr(uint32_t id, bool xmode);
char *GetModelStrFromCID(uint32_t cid); char *GetModelStrFromCID(uint32_t cid);
char *GetSelectedModulationStr(uint8_t id); char *GetSelectedModulationStr(uint8_t id);
uint32_t PackBits(uint8_t start, uint8_t len, uint8_t *bitstream); uint32_t PackBits(uint8_t start, uint8_t len, uint8_t *bitstream);