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

below 150

Browse source
This commit is contained in:
Doridian 2022-06-11 12:29:27 -07:00
commit 6b951960f1
3 changed files with 125 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

12
client/src/cmdhftopaz.c
View file

@ -388,7 +388,8 @@ static void topaz_print_dynamic_data(void) {
uint8_t *block_data = &topaz_tag.dynamic_memory[(blockno - 0x0F) * 8]; uint8_t *block_data = &topaz_tag.dynamic_memory[(blockno - 0x0F) * 8];
char lockbits[9]; char lockbits[9];
for (uint16_t j = 0; j < 8; j++) { for (uint16_t j = 0; j < 8; j++) {
sprintf(&line[3 * j], "%02x ", block_data[j]); int offset = 3 * j;
snprintf(line + offset, sizeof(line) - offset, "%02x ", block_data[j]);
lockbits[j] = topaz_byte_is_locked(blockno * 8 + j) ? 'y' : 'n'; lockbits[j] = topaz_byte_is_locked(blockno * 8 + j) ? 'y' : 'n';
} }
lockbits[8] = '\0'; lockbits[8] = '\0';
@ -458,7 +459,8 @@ int CmdHFTopazInfo(const char *Cmd) {
for (uint16_t i = 0; i <= 0x0c; i++) { for (uint16_t i = 0; i <= 0x0c; i++) {
char lockbits[9]; char lockbits[9];
for (uint16_t j = 0; j < 8; j++) { for (uint16_t j = 0; j < 8; j++) {
sprintf(&line[3 * j], "%02x ", topaz_tag.data_blocks[i][j] /*rall_response[2 + 8*i + j]*/); int offset = 3 * j;
snprintf(line + offset, sizeof(line) - offset, "%02x ", topaz_tag.data_blocks[i][j] /*rall_response[2 + 8*i + j]*/);
lockbits[j] = topaz_byte_is_locked(i * 8 + j) ? 'y' : 'n'; lockbits[j] = topaz_byte_is_locked(i * 8 + j) ? 'y' : 'n';
} }
lockbits[8] = '\0'; lockbits[8] = '\0';
@ -468,7 +470,8 @@ int CmdHFTopazInfo(const char *Cmd) {
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
PrintAndLogEx(SUCCESS, "Static Reserved block " _YELLOW_("0x0D")":"); PrintAndLogEx(SUCCESS, "Static Reserved block " _YELLOW_("0x0D")":");
for (uint16_t j = 0; j < 8; j++) { for (uint16_t j = 0; j < 8; j++) {
sprintf(&line[3 * j], "%02x ", topaz_tag.data_blocks[0x0d][j]); int offset = 3 * j;
snprintf(line + offset, sizeof(line) - offset, "%02x ", topaz_tag.data_blocks[0x0d][j]);
} }
PrintAndLogEx(NORMAL, "-------+--------+-------------------------+------------"); PrintAndLogEx(NORMAL, "-------+--------+-------------------------+------------");
PrintAndLogEx(NORMAL, " 0x%02x | 0x%02x | %s| %-3s", 0x0d, 0x0d * 8, line, "n/a"); PrintAndLogEx(NORMAL, " 0x%02x | 0x%02x | %s| %-3s", 0x0d, 0x0d * 8, line, "n/a");
@ -476,7 +479,8 @@ int CmdHFTopazInfo(const char *Cmd) {
PrintAndLogEx(SUCCESS, "Static Lockbits and OTP Bytes:"); PrintAndLogEx(SUCCESS, "Static Lockbits and OTP Bytes:");
for (uint16_t j = 0; j < 8; j++) { for (uint16_t j = 0; j < 8; j++) {
sprintf(&line[3 * j], "%02x ", topaz_tag.data_blocks[0x0e][j]); int offset = 3 * j;
snprintf(line + offset, sizeof(line) - offset, "%02x ", topaz_tag.data_blocks[0x0e][j]);
} }
PrintAndLogEx(NORMAL, "-------+--------+-------------------------+------------"); PrintAndLogEx(NORMAL, "-------+--------+-------------------------+------------");
PrintAndLogEx(NORMAL, " 0x%02x | 0x%02x | %s| %-3s", 0x0e, 0x0e * 8, line, "n/a"); PrintAndLogEx(NORMAL, " 0x%02x | 0x%02x | %s| %-3s", 0x0e, 0x0e * 8, line, "n/a");

214
client/src/cmdhw.c
View file

@ -37,62 +37,61 @@
static int CmdHelp(const char *Cmd); static int CmdHelp(const char *Cmd);
static void lookup_chipid_short(uint32_t iChipID, uint32_t mem_used) { static void lookup_chipid_short(uint32_t iChipID, uint32_t mem_used) {
char asBuff[120]; const char *asBuff;
memset(asBuff, 0, sizeof(asBuff));
switch (iChipID) { switch (iChipID) {
case 0x270B0A40: case 0x270B0A40:
sprintf(asBuff, "AT91SAM7S512 Rev A"); asBuff = "AT91SAM7S512 Rev A";
break; break;
case 0x270B0A4F: case 0x270B0A4F:
sprintf(asBuff, "AT91SAM7S512 Rev B"); asBuff = "AT91SAM7S512 Rev B";
break; break;
case 0x270D0940: case 0x270D0940:
sprintf(asBuff, "AT91SAM7S256 Rev A"); asBuff = "AT91SAM7S256 Rev A";
break; break;
case 0x270B0941: case 0x270B0941:
sprintf(asBuff, "AT91SAM7S256 Rev B"); asBuff = "AT91SAM7S256 Rev B";
break; break;
case 0x270B0942: case 0x270B0942:
sprintf(asBuff, "AT91SAM7S256 Rev C"); asBuff = "AT91SAM7S256 Rev C";
break; break;
case 0x270B0943: case 0x270B0943:
sprintf(asBuff, "AT91SAM7S256 Rev D"); asBuff = "AT91SAM7S256 Rev D";
break; break;
case 0x270C0740: case 0x270C0740:
sprintf(asBuff, "AT91SAM7S128 Rev A"); asBuff = "AT91SAM7S128 Rev A";
break; break;
case 0x270A0741: case 0x270A0741:
sprintf(asBuff, "AT91SAM7S128 Rev B"); asBuff = "AT91SAM7S128 Rev B";
break; break;
case 0x270A0742: case 0x270A0742:
sprintf(asBuff, "AT91SAM7S128 Rev C"); asBuff = "AT91SAM7S128 Rev C";
break; break;
case 0x270A0743: case 0x270A0743:
sprintf(asBuff, "AT91SAM7S128 Rev D"); asBuff = "AT91SAM7S128 Rev D";
break; break;
case 0x27090540: case 0x27090540:
sprintf(asBuff, "AT91SAM7S64 Rev A"); asBuff = "AT91SAM7S64 Rev A";
break; break;
case 0x27090543: case 0x27090543:
sprintf(asBuff, "AT91SAM7S64 Rev B"); asBuff = "AT91SAM7S64 Rev B";
break; break;
case 0x27090544: case 0x27090544:
sprintf(asBuff, "AT91SAM7S64 Rev C"); asBuff = "AT91SAM7S64 Rev C";
break; break;
case 0x27080342: case 0x27080342:
sprintf(asBuff, "AT91SAM7S321 Rev A"); asBuff = "AT91SAM7S321 Rev A";
break; break;
case 0x27080340: case 0x27080340:
sprintf(asBuff, "AT91SAM7S32 Rev A"); asBuff = "AT91SAM7S32 Rev A";
break; break;
case 0x27080341: case 0x27080341:
sprintf(asBuff, "AT91SAM7S32 Rev B"); asBuff = "AT91SAM7S32 Rev B";
break; break;
case 0x27050241: case 0x27050241:
sprintf(asBuff, "AT9SAM7S161 Rev A"); asBuff = "AT9SAM7S161 Rev A";
break; break;
case 0x27050240: case 0x27050240:
sprintf(asBuff, "AT91SAM7S16 Rev A"); asBuff = "AT91SAM7S16 Rev A";
break; break;
} }
PrintAndLogEx(NORMAL, " MCU....... " _YELLOW_("%s"), asBuff); PrintAndLogEx(NORMAL, " MCU....... " _YELLOW_("%s"), asBuff);
@ -140,210 +139,224 @@ static void lookup_chipid_short(uint32_t iChipID, uint32_t mem_used) {
} }
static void lookupChipID(uint32_t iChipID, uint32_t mem_used) { static void lookupChipID(uint32_t iChipID, uint32_t mem_used) {
char asBuff[120]; const char *asBuff;
memset(asBuff, 0, sizeof(asBuff));
uint32_t mem_avail = 0; uint32_t mem_avail = 0;
PrintAndLogEx(NORMAL, "\n [ " _YELLOW_("Hardware") " ]"); PrintAndLogEx(NORMAL, "\n [ " _YELLOW_("Hardware") " ]");
switch (iChipID) { switch (iChipID) {
case 0x270B0A40: case 0x270B0A40:
sprintf(asBuff, "AT91SAM7S512 Rev A"); asBuff = "AT91SAM7S512 Rev A";
break; break;
case 0x270B0A4F: case 0x270B0A4F:
sprintf(asBuff, "AT91SAM7S512 Rev B"); asBuff = "AT91SAM7S512 Rev B";
break; break;
case 0x270D0940: case 0x270D0940:
sprintf(asBuff, "AT91SAM7S256 Rev A"); asBuff = "AT91SAM7S256 Rev A";
break; break;
case 0x270B0941: case 0x270B0941:
sprintf(asBuff, "AT91SAM7S256 Rev B"); asBuff = "AT91SAM7S256 Rev B";
break; break;
case 0x270B0942: case 0x270B0942:
sprintf(asBuff, "AT91SAM7S256 Rev C"); asBuff = "AT91SAM7S256 Rev C";
break; break;
case 0x270B0943: case 0x270B0943:
sprintf(asBuff, "AT91SAM7S256 Rev D"); asBuff = "AT91SAM7S256 Rev D";
break; break;
case 0x270C0740: case 0x270C0740:
sprintf(asBuff, "AT91SAM7S128 Rev A"); asBuff = "AT91SAM7S128 Rev A";
break; break;
case 0x270A0741: case 0x270A0741:
sprintf(asBuff, "AT91SAM7S128 Rev B"); asBuff = "AT91SAM7S128 Rev B";
break; break;
case 0x270A0742: case 0x270A0742:
sprintf(asBuff, "AT91SAM7S128 Rev C"); asBuff = "AT91SAM7S128 Rev C";
break; break;
case 0x270A0743: case 0x270A0743:
sprintf(asBuff, "AT91SAM7S128 Rev D"); asBuff = "AT91SAM7S128 Rev D";
break; break;
case 0x27090540: case 0x27090540:
sprintf(asBuff, "AT91SAM7S64 Rev A"); asBuff = "AT91SAM7S64 Rev A";
break; break;
case 0x27090543: case 0x27090543:
sprintf(asBuff, "AT91SAM7S64 Rev B"); asBuff = "AT91SAM7S64 Rev B";
break; break;
case 0x27090544: case 0x27090544:
sprintf(asBuff, "AT91SAM7S64 Rev C"); asBuff = "AT91SAM7S64 Rev C";
break; break;
case 0x27080342: case 0x27080342:
sprintf(asBuff, "AT91SAM7S321 Rev A"); asBuff = "AT91SAM7S321 Rev A";
break; break;
case 0x27080340: case 0x27080340:
sprintf(asBuff, "AT91SAM7S32 Rev A"); asBuff = "AT91SAM7S32 Rev A";
break; break;
case 0x27080341: case 0x27080341:
sprintf(asBuff, "AT91SAM7S32 Rev B"); asBuff = "AT91SAM7S32 Rev B";
break; break;
case 0x27050241: case 0x27050241:
sprintf(asBuff, "AT9SAM7S161 Rev A"); asBuff = "AT9SAM7S161 Rev A";
break; break;
case 0x27050240: case 0x27050240:
sprintf(asBuff, "AT91SAM7S16 Rev A"); asBuff = "AT91SAM7S16 Rev A";
break;
default:
asBuff = "Unknown";
break; break;
} }
PrintAndLogEx(NORMAL, " --= uC: " _YELLOW_("%s"), asBuff); PrintAndLogEx(NORMAL, " --= uC: " _YELLOW_("%s"), asBuff);
switch ((iChipID & 0xE0) >> 5) { switch ((iChipID & 0xE0) >> 5) {
case 1: case 1:
sprintf(asBuff, "ARM946ES"); asBuff = "ARM946ES";
break; break;
case 2: case 2:
sprintf(asBuff, "ARM7TDMI"); asBuff = "ARM7TDMI";
break; break;
case 4: case 4:
sprintf(asBuff, "ARM920T"); asBuff = "ARM920T";
break; break;
case 5: case 5:
sprintf(asBuff, "ARM926EJS"); asBuff = "ARM926EJS";
break;
default:
asBuff = "Unknown";
break; break;
} }
PrintAndLogEx(NORMAL, " --= Embedded Processor: %s", asBuff); PrintAndLogEx(NORMAL, " --= Embedded Processor: %s", asBuff);
switch ((iChipID & 0xF0000) >> 16) { switch ((iChipID & 0xF0000) >> 16) {
case 1: case 1:
sprintf(asBuff, "1K bytes"); asBuff = "1K bytes";
break; break;
case 2: case 2:
sprintf(asBuff, "2K bytes"); asBuff = "2K bytes";
break; break;
case 3: case 3:
sprintf(asBuff, "6K bytes"); asBuff = "6K bytes";
break; break;
case 4: case 4:
sprintf(asBuff, "112K bytes"); asBuff = "112K bytes";
break; break;
case 5: case 5:
sprintf(asBuff, "4K bytes"); asBuff = "4K bytes";
break; break;
case 6: case 6:
sprintf(asBuff, "80K bytes"); asBuff = "80K bytes";
break; break;
case 7: case 7:
sprintf(asBuff, "160K bytes"); asBuff = "160K bytes";
break; break;
case 8: case 8:
sprintf(asBuff, "8K bytes"); asBuff = "8K bytes";
break; break;
case 9: case 9:
sprintf(asBuff, "16K bytes"); asBuff = "16K bytes";
break; break;
case 10: case 10:
sprintf(asBuff, "32K bytes"); asBuff = "32K bytes";
break; break;
case 11: case 11:
sprintf(asBuff, "64K bytes"); asBuff = "64K bytes";
break; break;
case 12: case 12:
sprintf(asBuff, "128K bytes"); asBuff = "128K bytes";
break; break;
case 13: case 13:
sprintf(asBuff, "256K bytes"); asBuff = "256K bytes";
break; break;
case 14: case 14:
sprintf(asBuff, "96K bytes"); asBuff = "96K bytes";
break; break;
case 15: case 15:
sprintf(asBuff, "512K bytes"); asBuff = "512K bytes";
break;
default:
asBuff = "Unknown";
break; break;
} }
PrintAndLogEx(NORMAL, " --= Internal SRAM size: %s", asBuff); PrintAndLogEx(NORMAL, " --= Internal SRAM size: %s", asBuff);
switch ((iChipID & 0xFF00000) >> 20) { switch ((iChipID & 0xFF00000) >> 20) {
case 0x19: case 0x19:
sprintf(asBuff, "AT91SAM9xx Series"); asBuff = "AT91SAM9xx Series";
break; break;
case 0x29: case 0x29:
sprintf(asBuff, "AT91SAM9XExx Series"); asBuff = "AT91SAM9XExx Series";
break; break;
case 0x34: case 0x34:
sprintf(asBuff, "AT91x34 Series"); asBuff = "AT91x34 Series";
break; break;
case 0x37: case 0x37:
sprintf(asBuff, "CAP7 Series"); asBuff = "CAP7 Series";
break; break;
case 0x39: case 0x39:
sprintf(asBuff, "CAP9 Series"); asBuff = "CAP9 Series";
break; break;
case 0x3B: case 0x3B:
sprintf(asBuff, "CAP11 Series"); asBuff = "CAP11 Series";
break; break;
case 0x40: case 0x40:
sprintf(asBuff, "AT91x40 Series"); asBuff = "AT91x40 Series";
break; break;
case 0x42: case 0x42:
sprintf(asBuff, "AT91x42 Series"); asBuff = "AT91x42 Series";
break; break;
case 0x55: case 0x55:
sprintf(asBuff, "AT91x55 Series"); asBuff = "AT91x55 Series";
break; break;
case 0x60: case 0x60:
sprintf(asBuff, "AT91SAM7Axx Series"); asBuff = "AT91SAM7Axx Series";
break; break;
case 0x61: case 0x61:
sprintf(asBuff, "AT91SAM7AQxx Series"); asBuff = "AT91SAM7AQxx Series";
break; break;
case 0x63: case 0x63:
sprintf(asBuff, "AT91x63 Series"); asBuff = "AT91x63 Series";
break; break;
case 0x70: case 0x70:
sprintf(asBuff, "AT91SAM7Sxx Series"); asBuff = "AT91SAM7Sxx Series";
break; break;
case 0x71: case 0x71:
sprintf(asBuff, "AT91SAM7XCxx Series"); asBuff = "AT91SAM7XCxx Series";
break; break;
case 0x72: case 0x72:
sprintf(asBuff, "AT91SAM7SExx Series"); asBuff = "AT91SAM7SExx Series";
break; break;
case 0x73: case 0x73:
sprintf(asBuff, "AT91SAM7Lxx Series"); asBuff = "AT91SAM7Lxx Series";
break; break;
case 0x75: case 0x75:
sprintf(asBuff, "AT91SAM7Xxx Series"); asBuff = "AT91SAM7Xxx Series";
break; break;
case 0x92: case 0x92:
sprintf(asBuff, "AT91x92 Series"); asBuff = "AT91x92 Series";
break; break;
case 0xF0: case 0xF0:
sprintf(asBuff, "AT75Cxx Series"); asBuff = "AT75Cxx Series";
break;
default:
asBuff = "Unknown";
break; break;
} }
PrintAndLogEx(NORMAL, " --= Architecture identifier: %s", asBuff); PrintAndLogEx(NORMAL, " --= Architecture identifier: %s", asBuff);
switch ((iChipID & 0x70000000) >> 28) { switch ((iChipID & 0x70000000) >> 28) {
case 0: case 0:
sprintf(asBuff, "ROM"); asBuff = "ROM";
break; break;
case 1: case 1:
sprintf(asBuff, "ROMless or on-chip Flash"); asBuff = "ROMless or on-chip Flash";
break; break;
case 2: case 2:
sprintf(asBuff, "Embedded flash memory"); asBuff = "Embedded flash memory";
break; break;
case 3: case 3:
sprintf(asBuff, "ROM and Embedded flash memory\nNVPSIZ is ROM size\nNVPSIZ2 is Flash size"); asBuff = "ROM and Embedded flash memory\nNVPSIZ is ROM size\nNVPSIZ2 is Flash size";
break; break;
case 4: case 4:
sprintf(asBuff, "SRAM emulating ROM"); asBuff = "SRAM emulating ROM";
break;
default:
asBuff = "Unknown";
break; break;
} }
switch ((iChipID & 0xF00) >> 8) { switch ((iChipID & 0xF00) >> 8) {
@ -388,34 +401,34 @@ static void lookupChipID(uint32_t iChipID, uint32_t mem_used) {
/* /*
switch ((iChipID & 0xF000) >> 12) { switch ((iChipID & 0xF000) >> 12) {
case 0: case 0:
sprintf(asBuff, "None"); asBuff = "None");
break; break;
case 1: case 1:
sprintf(asBuff, "8K bytes"); asBuff = "8K bytes");
break; break;
case 2: case 2:
sprintf(asBuff, "16K bytes"); asBuff = "16K bytes");
break; break;
case 3: case 3:
sprintf(asBuff, "32K bytes"); asBuff = "32K bytes");
break; break;
case 5: case 5:
sprintf(asBuff, "64K bytes"); asBuff = "64K bytes");
break; break;
case 7: case 7:
sprintf(asBuff, "128K bytes"); asBuff = "128K bytes");
break; break;
case 9: case 9:
sprintf(asBuff, "256K bytes"); asBuff = "256K bytes");
break; break;
case 10: case 10:
sprintf(asBuff, "512K bytes"); asBuff = "512K bytes");
break; break;
case 12: case 12:
sprintf(asBuff, "1024K bytes"); asBuff = "1024K bytes");
break; break;
case 14: case 14:
sprintf(asBuff, "2048K bytes"); asBuff = "2048K bytes");
break; break;
} }
PrintAndLogEx(NORMAL, " --= Second nonvolatile program memory size: %s", asBuff); PrintAndLogEx(NORMAL, " --= Second nonvolatile program memory size: %s", asBuff);
@ -464,22 +477,25 @@ static int CmdDbg(const char *Cmd) {
} }
uint8_t curr = resp.data.asBytes[0]; uint8_t curr = resp.data.asBytes[0];
char dbglvlstr[20] = {0}; const char* dbglvlstr;
switch (curr) { switch (curr) {
case DBG_NONE: case DBG_NONE:
sprintf(dbglvlstr, "none"); dbglvlstr = "none";
break; break;
case DBG_ERROR: case DBG_ERROR:
sprintf(dbglvlstr, "error"); dbglvlstr = "error";
break; break;
case DBG_INFO: case DBG_INFO:
sprintf(dbglvlstr, "info"); dbglvlstr = "info";
break; break;
case DBG_DEBUG: case DBG_DEBUG:
sprintf(dbglvlstr, "debug"); dbglvlstr = "debug";
break; break;
case DBG_EXTENDED: case DBG_EXTENDED:
sprintf(dbglvlstr, "extended"); dbglvlstr = "extended";
break;
default:
dbglvlstr = "unknown";
break; break;
} }
PrintAndLogEx(INFO, " Current debug log level..... %d ( " _YELLOW_("%s")" )", curr, dbglvlstr); PrintAndLogEx(INFO, " Current debug log level..... %d ( " _YELLOW_("%s")" )", curr, dbglvlstr);

4
client/src/cmdlf.c
View file

@ -234,7 +234,7 @@ int CmdLFCommandRead(const char *Cmd) {
); );
char div_str[70] = {0}; char div_str[70] = {0};
sprintf(div_str, "Extra symbol definition and duration (up to %i)", LF_CMDREAD_MAX_EXTRA_SYMBOLS); snprintf(div_str, sizeof(div_str), "Extra symbol definition and duration (up to %i)", LF_CMDREAD_MAX_EXTRA_SYMBOLS);
void *argtable[] = { void *argtable[] = {
arg_param_begin, arg_param_begin,
@ -571,7 +571,7 @@ int CmdLFConfig(const char *Cmd) {
); );
char div_str[70] = {0}; char div_str[70] = {0};
sprintf(div_str, "Manually set freq divisor. %d -> 134 kHz, %d -> 125 kHz", LF_DIVISOR_134, LF_DIVISOR_125); snprintf(div_str, sizeof(div_str), "Manually set freq divisor. %d -> 134 kHz, %d -> 125 kHz", LF_DIVISOR_134, LF_DIVISOR_125);
void *argtable[] = { void *argtable[] = {
arg_param_begin, arg_param_begin,