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

make style

Browse source
This commit is contained in:
Philippe Teuwen 2020-12-30 01:31:40 +01:00
commit a0e110941a
5 changed files with 35 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

4
armsrc/appmain.c
View file

@ -314,9 +314,9 @@ static void SendVersion(void) {
struct p payload; struct p payload;
payload.id = *(AT91C_DBGU_CIDR); payload.id = *(AT91C_DBGU_CIDR);
#ifdef WITH_NO_COMPRESSION #ifdef WITH_NO_COMPRESSION
payload.section_size = (uint32_t)&_bootrom_end - (uint32_t)&_bootrom_start + (uint32_t)&__os_size__; payload.section_size = (uint32_t)&_bootrom_end - (uint32_t)&_bootrom_start + (uint32_t)&__os_size__;
#else #else
payload.section_size = text_and_rodata_section_size + compressed_data_section_size; payload.section_size = text_and_rodata_section_size + compressed_data_section_size;
#endif #endif
payload.versionstr_len = strlen(VersionString) + 1; payload.versionstr_len = strlen(VersionString) + 1;
memcpy(payload.versionstr, VersionString, payload.versionstr_len); memcpy(payload.versionstr, VersionString, payload.versionstr_len);

8
armsrc/start.c
View file

@ -52,15 +52,15 @@ void Vector(void) {
common_area.flags.osimage_present = 1; common_area.flags.osimage_present = 1;
#ifdef WITH_NO_COMPRESSION #ifdef WITH_NO_COMPRESSION
/* Set up data segment: Copy from flash to ram */ /* Set up data segment: Copy from flash to ram */
char *src = &__data_src_start__; char *src = &__data_src_start__;
char *dst = &__data_start__; char *dst = &__data_start__;
char *end = &__data_end__; char *end = &__data_end__;
while(dst < end) *dst++ = *src++; while (dst < end) *dst++ = *src++;
dst = &__bss_start__; dst = &__bss_start__;
end = &__bss_end__; end = &__bss_end__;
#else #else
uncompress_data_section(); uncompress_data_section();
/* Set up (that is: clear) BSS. */ /* Set up (that is: clear) BSS. */
char *dst = &__bss_start__; char *dst = &__bss_start__;

28
client/src/cmdhfmfu.c
View file

@ -675,10 +675,10 @@ int ul_print_type(uint32_t tagtype, uint8_t spaces) {
if (ismagic) if (ismagic)
snprintf(typestr + strlen(typestr), 4, " ("); snprintf(typestr + strlen(typestr), 4, " (");
snprintf(typestr + strlen(typestr) , sizeof(typestr) - strlen(typestr), " %s ", (tagtype & MAGIC) ? _GREEN_("magic") : ""); snprintf(typestr + strlen(typestr), sizeof(typestr) - strlen(typestr), " %s ", (tagtype & MAGIC) ? _GREEN_("magic") : "");
tagtype ^= MAGIC; tagtype ^= MAGIC;
snprintf(typestr + strlen(typestr) , sizeof(typestr) - strlen(typestr), "%s", (tagtype & MAGIC_1A) ? _GREEN_("Gen 1a") : ""); snprintf(typestr + strlen(typestr), sizeof(typestr) - strlen(typestr), "%s", (tagtype & MAGIC_1A) ? _GREEN_("Gen 1a") : "");
snprintf(typestr + strlen(typestr) , sizeof(typestr) - strlen(typestr), "%s", (tagtype & MAGIC_1B) ? _GREEN_("Gen 1b") : ""); snprintf(typestr + strlen(typestr), sizeof(typestr) - strlen(typestr), "%s", (tagtype & MAGIC_1B) ? _GREEN_("Gen 1b") : "");
if (ismagic) if (ismagic)
snprintf(typestr + strlen(typestr), 4, " )"); snprintf(typestr + strlen(typestr), 4, " )");
@ -840,9 +840,9 @@ static int ulev1_print_counters(void) {
if (len == 3) { if (len == 3) {
PrintAndLogEx(INFO, " [%0d]: %s", i, sprint_hex(counter, 3)); PrintAndLogEx(INFO, " [%0d]: %s", i, sprint_hex(counter, 3));
PrintAndLogEx(SUCCESS, " - %02X tearing (%s)" PrintAndLogEx(SUCCESS, " - %02X tearing (%s)"
, tear[0] , tear[0]
, (tear[0] == 0xBD) ? _GREEN_("ok") : _RED_("fail") , (tear[0] == 0xBD) ? _GREEN_("ok") : _RED_("fail")
); );
} }
} }
return len; return len;
@ -938,7 +938,7 @@ static int ulev1_print_signature(TagTypeUL_t tagtype, uint8_t *uid, uint8_t *sig
PrintAndLogEx(INFO, "IC signature public key value: %s", nxp_mfu_public_keys[i].value); PrintAndLogEx(INFO, "IC signature public key value: %s", nxp_mfu_public_keys[i].value);
PrintAndLogEx(INFO, " Elliptic curve parameters: NID_secp128r1"); PrintAndLogEx(INFO, " Elliptic curve parameters: NID_secp128r1");
PrintAndLogEx(INFO, " TAG IC Signature: %s", sprint_hex_inrow(signature, signature_len)); PrintAndLogEx(INFO, " TAG IC Signature: %s", sprint_hex_inrow(signature, signature_len));
PrintAndLogEx(SUCCESS, " Signature verification (" _GREEN_("successful") ")" ); PrintAndLogEx(SUCCESS, " Signature verification (" _GREEN_("successful") ")");
return PM3_SUCCESS; return PM3_SUCCESS;
} }
@ -969,9 +969,9 @@ static int ntag_print_counter(void) {
(void)len; (void)len;
PrintAndLogEx(INFO, " [02]: %s", sprint_hex(counter, 3)); PrintAndLogEx(INFO, " [02]: %s", sprint_hex(counter, 3));
PrintAndLogEx(SUCCESS, " - %02X tearing (%s)" PrintAndLogEx(SUCCESS, " - %02X tearing (%s)"
, tear[0] , tear[0]
, (tear[0] == 0xBD) ? _GREEN_("ok") : _RED_("fail") , (tear[0] == 0xBD) ? _GREEN_("ok") : _RED_("fail")
); );
return len; return len;
} }
@ -1540,7 +1540,7 @@ static int CmdHF14AMfUWrBl(const char *Cmd) {
has_auth_key = true; has_auth_key = true;
} else if (ak_len == 4) { } else if (ak_len == 4) {
has_pwd = true; has_pwd = true;
} else if (ak_len != 0){ } else if (ak_len != 0) {
PrintAndLogEx(WARNING, "ERROR: Key is incorrect length\n"); PrintAndLogEx(WARNING, "ERROR: Key is incorrect length\n");
return PM3_EINVARG; return PM3_EINVARG;
} }
@ -1664,7 +1664,7 @@ static int CmdHF14AMfURdBl(const char *Cmd) {
has_auth_key = true; has_auth_key = true;
} else if (ak_len == 4) { } else if (ak_len == 4) {
has_pwd = true; has_pwd = true;
} else if (ak_len != 0){ } else if (ak_len != 0) {
PrintAndLogEx(WARNING, "ERROR: Key is incorrect length\n"); PrintAndLogEx(WARNING, "ERROR: Key is incorrect length\n");
return PM3_EINVARG; return PM3_EINVARG;
} }
@ -1932,13 +1932,13 @@ static int CmdHF14AMfUDump(const char *Cmd) {
has_auth_key = true; has_auth_key = true;
} else if (ak_len == 4) { } else if (ak_len == 4) {
has_pwd = true; has_pwd = true;
} else if (ak_len != 0){ } else if (ak_len != 0) {
PrintAndLogEx(WARNING, "ERROR: Key is incorrect length\n"); PrintAndLogEx(WARNING, "ERROR: Key is incorrect length\n");
return PM3_EINVARG; return PM3_EINVARG;
} }
bool manual_pages = false; bool manual_pages = false;
if ( start_page > 0) if (start_page > 0)
manual_pages = true; manual_pages = true;
if (pages != 16) if (pages != 16)

4
doc/commands.md
View file

@ -198,8 +198,8 @@ Check column "offline" for their availability.
|command |offline |description |command |offline |description
|------- |------- |----------- |------- |------- |-----------
|`hf epa help `|Y |`This help` |`hf epa help `|Y |`This help`
|`hf epa cnonces `|N |`<m> <n> <d> Acquire n>0 encrypted PACE nonces of size m>0 with d sec pauses` |`hf epa cnonces `|N |`Acquire encrypted PACE nonces of specific size`
|`hf epa preplay `|N |`<mse> <get> <map> <pka> <ma> Perform PACE protocol by replaying given APDUs` |`hf epa preplay `|N |`Perform PACE protocol by replaying given APDUs`
### hf emrtd ### hf emrtd