RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-01-09 01:36:52 +08:00
Code Issues Projects Releases Packages Wiki Activity

make style

Browse source
This commit is contained in:
Philippe Teuwen 2019-03-15 00:20:42 +01:00
parent 2f2dfd6239
commit b538a67ba3
2 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
client/cmdlfhitag.c
View file

@ -348,17 +348,17 @@ static void printHitagConfiguration(uint8_t config) {
memset(msg, 0, sizeof(msg)); memset(msg, 0, sizeof(msg));
// encoding // encoding
if (config & 0x1) { if (config & 0x1) {
strcat(msg, "Biphase encoding"); strcat(msg, "Biphase encoding");
} else { } else {
strcat(msg, "Manchester encoding"); strcat(msg, "Manchester encoding");
} }
PrintAndLogEx(SUCCESS, "%s", msg); PrintAndLogEx(SUCCESS, "%s", msg);
memset(msg, 0, sizeof(msg)); memset(msg, 0, sizeof(msg));
// version // version
strcat(msg, "Coding in HITAG 2 operation: %s"); strcat(msg, "Coding in HITAG 2 operation: %s");
uint8_t foo = (config & 0x6) >> 1; uint8_t foo = (config & 0x6) >> 1;
switch ( foo ) { switch (foo) {
case 0: case 0:
PrintAndLogEx(SUCCESS, "Version: public mode B, Coding: biphase"); PrintAndLogEx(SUCCESS, "Version: public mode B, Coding: biphase");
PrintAndLogEx(SUCCESS, msg, (config & 0x1) ? "biphase" : "manchester"); PrintAndLogEx(SUCCESS, msg, (config & 0x1) ? "biphase" : "manchester");
@ -366,60 +366,60 @@ static void printHitagConfiguration(uint8_t config) {
case 1: case 1:
PrintAndLogEx(SUCCESS, "Version: public mode A, Coding: manchester"); PrintAndLogEx(SUCCESS, "Version: public mode A, Coding: manchester");
PrintAndLogEx(SUCCESS, msg, (config & 0x1) ? "biphase" : "manchester"); PrintAndLogEx(SUCCESS, msg, (config & 0x1) ? "biphase" : "manchester");
break; break;
case 2: case 2:
PrintAndLogEx(SUCCESS, "Version: public mode C, Coding: biphase"); PrintAndLogEx(SUCCESS, "Version: public mode C, Coding: biphase");
PrintAndLogEx(SUCCESS, msg, (config & 0x1) ? "biphase" : "manchester"); PrintAndLogEx(SUCCESS, msg, (config & 0x1) ? "biphase" : "manchester");
break; break;
case 3: case 3:
PrintAndLogEx(SUCCESS, "Version: Hitag2"); PrintAndLogEx(SUCCESS, "Version: Hitag2");
PrintAndLogEx(SUCCESS, msg, (config & 0x1) ? "biphase" : "manchester"); PrintAndLogEx(SUCCESS, msg, (config & 0x1) ? "biphase" : "manchester");
break; break;
} }
memset(msg, 0, sizeof(msg)); memset(msg, 0, sizeof(msg));
// mode // mode
if (config & 0x8) { if (config & 0x8) {
strcat(msg, "Tag is in : " _YELLOW_("Crypto mode") ); strcat(msg, "Tag is in : " _YELLOW_("Crypto mode"));
} else { } else {
strcat(msg, "Tag is in : " _YELLOW_("Password mode") ); strcat(msg, "Tag is in : " _YELLOW_("Password mode"));
} }
PrintAndLogEx(SUCCESS, "%s", msg); PrintAndLogEx(SUCCESS, "%s", msg);
memset(msg, 0, sizeof(msg)); memset(msg, 0, sizeof(msg));
// page access // page access
if (config & 0x10) { if (config & 0x10) {
strcat(msg, "Page 6,7 : read only"); strcat(msg, "Page 6,7 : read only");
} else { } else {
strcat(msg, "Page 6,7 : " _GREEN_("read write")); strcat(msg, "Page 6,7 : " _GREEN_("read write"));
} }
PrintAndLogEx(SUCCESS, "%s", msg); PrintAndLogEx(SUCCESS, "%s", msg);
memset(msg, 0, sizeof(msg)); memset(msg, 0, sizeof(msg));
// page access // page access
if (config & 0x20) { if (config & 0x20) {
strcat(msg, "Page 4,5 : read only"); strcat(msg, "Page 4,5 : read only");
} else { } else {
strcat(msg, "Page 4,5 : " _GREEN_("read write")); strcat(msg, "Page 4,5 : " _GREEN_("read write"));
} }
PrintAndLogEx(SUCCESS, "%s", msg); PrintAndLogEx(SUCCESS, "%s", msg);
memset(msg, 0, sizeof(msg)); memset(msg, 0, sizeof(msg));
// OTP // OTP
if (config & 0x40) { if (config & 0x40) {
strcat(msg, "Page 3 : read only. Configuration byte and password tag " _RED_("FIXED / IRREVERSIBLE") ); strcat(msg, "Page 3 : read only. Configuration byte and password tag " _RED_("FIXED / IRREVERSIBLE"));
} else { } else {
strcat(msg, "Page 3 : " _GREEN_("read write")); strcat(msg, "Page 3 : " _GREEN_("read write"));
} }
PrintAndLogEx(SUCCESS, "%s", msg); PrintAndLogEx(SUCCESS, "%s", msg);
memset(msg, 0, sizeof(msg)); memset(msg, 0, sizeof(msg));
// OTP // OTP
if (config & 0x80) { if (config & 0x80) {
strcat(msg, "Page 1 " _RED_("locked") "\n"); strcat(msg, "Page 1 " _RED_("locked") "\n");
if (config & 0x8) { if (config & 0x8) {
strcat(msg + strlen(msg), "Page 2 : " _RED_("locked") ); strcat(msg + strlen(msg), "Page 2 : " _RED_("locked"));
} else { } else {
strcat(msg + strlen(msg), "Page 2 : read only"); strcat(msg + strlen(msg), "Page 2 : read only");
} }
@ -434,14 +434,14 @@ int CmdLFHitagInfo(const char *Cmd) {
PrintAndLogEx(INFO, "Hitag2 tag information "); PrintAndLogEx(INFO, "Hitag2 tag information ");
PrintAndLogEx(INFO, "To be done!"); PrintAndLogEx(INFO, "To be done!");
PrintAndLogEx(INFO, "------------------------------------"); PrintAndLogEx(INFO, "------------------------------------");
char ctmp = tolower(param_getchar(Cmd, 0)); char ctmp = tolower(param_getchar(Cmd, 0));
if (ctmp == 'h') return usage_hitag_info(); if (ctmp == 'h') return usage_hitag_info();
// read block3, get configuration byte. // read block3, get configuration byte.
// common configurations. // common configurations.
printHitagConfiguration( 0x06 ); printHitagConfiguration(0x06);
//printHitagConfiguration( 0x0E ); //printHitagConfiguration( 0x0E );
//printHitagConfiguration( 0x02 ); //printHitagConfiguration( 0x02 );
//printHitagConfiguration( 0x00 ); //printHitagConfiguration( 0x00 );

8
client/util.c
View file

@ -694,7 +694,7 @@ int binarraytohex(char *target, const size_t targetlen, char *source, size_t src
uint32_t r = 0; // consumed bits uint32_t r = 0; // consumed bits
uint8_t w = 0; // wrong bits separator printed uint8_t w = 0; // wrong bits separator printed
for (size_t s = 0 ; s < srclen; s++) { for (size_t s = 0 ; s < srclen; s++) {
if ((source[s]==0) || (source[s]==1)) { if ((source[s] == 0) || (source[s] == 1)) {
w = 0; w = 0;
x += (source[s] << (3 - i)); x += (source[s] << (3 - i));
i++; i++;
@ -702,7 +702,7 @@ int binarraytohex(char *target, const size_t targetlen, char *source, size_t src
if (t >= targetlen - 2) return r; if (t >= targetlen - 2) return r;
sprintf(target + t, "%X", x); sprintf(target + t, "%X", x);
t++; t++;
r+=4; r += 4;
x = 0; x = 0;
i = 0; i = 0;
} }
@ -711,8 +711,8 @@ int binarraytohex(char *target, const size_t targetlen, char *source, size_t src
if (t >= targetlen - 5) return r; if (t >= targetlen - 5) return r;
w = 0; w = 0;
sprintf(target + t, "%X[%i]", x, i); sprintf(target + t, "%X[%i]", x, i);
t+=4; t += 4;
r+=i; r += i;
x = 0; x = 0;
i = 0; i = 0;
} }