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

make style

Browse source
This commit is contained in:
Philippe Teuwen 2021-12-31 12:45:21 +01:00
commit 23b4a47e94
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
armsrc/hitagS.c
View file

@ -450,7 +450,7 @@ static void hitagS_handle_reader_command(uint8_t *rx, const size_t rxlen,
REV32((rx[3] << 24) + (rx[2] << 16) + (rx[1] << 8) + rx[0]) REV32((rx[3] << 24) + (rx[2] << 16) + (rx[1] << 8) + rx[0])
); );
Dbprintf(",{0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X}", Dbprintf(",{0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X, 0x%02X}",
rx[0], rx[1], rx[2], rx[3], rx[0], rx[1], rx[2], rx[3],
rx[4], rx[5], rx[6], rx[7] rx[4], rx[5], rx[6], rx[7]
); );
@ -734,7 +734,7 @@ static int hitagS_handle_tag_auth(hitag_function htf, uint64_t key, uint64_t NrA
for (int j = 0; j < 8; j++) { for (int j = 0; j < 8; j++) {
response_bit[i] = 0; response_bit[i] = 0;
if ((crc & ((mask << 7) >> j)) != 0){ if ((crc & ((mask << 7) >> j)) != 0) {
response_bit[i] = 1; response_bit[i] = 1;
} }
i++; i++;
@ -1275,7 +1275,7 @@ void ReadHitagS(hitag_function htf, hitag_data *htd, bool ledcontrol) {
DbpString("Authenticating using nr,ar pair:"); DbpString("Authenticating using nr,ar pair:");
memcpy(NrAr_, htd->auth.NrAr, 8); memcpy(NrAr_, htd->auth.NrAr, 8);
Dbhexdump(8, NrAr_, false); Dbhexdump(8, NrAr_, false);
NrAr = NrAr_[7] | NrAr = NrAr_[7] |
((uint64_t)NrAr_[6]) << 8 | ((uint64_t)NrAr_[6]) << 8 |
((uint64_t)NrAr_[5]) << 16 | ((uint64_t)NrAr_[5]) << 16 |
((uint64_t)NrAr_[4]) << 24 | ((uint64_t)NrAr_[4]) << 24 |
@ -1283,7 +1283,7 @@ void ReadHitagS(hitag_function htf, hitag_data *htd, bool ledcontrol) {
((uint64_t)NrAr_[2]) << 40 | ((uint64_t)NrAr_[2]) << 40 |
((uint64_t)NrAr_[1]) << 48 | ((uint64_t)NrAr_[1]) << 48 |
((uint64_t)NrAr_[0]) << 56 ((uint64_t)NrAr_[0]) << 56
; ;
break; break;
} }
case RHTSF_KEY: { case RHTSF_KEY: {
@ -1296,7 +1296,7 @@ void ReadHitagS(hitag_function htf, hitag_data *htd, bool ledcontrol) {
((uint64_t)key_[2]) << 24 | ((uint64_t)key_[2]) << 24 |
((uint64_t)key_[1]) << 32 | ((uint64_t)key_[1]) << 32 |
((uint64_t)key_[0]) << 40 ((uint64_t)key_[0]) << 40
; ;
break; break;
} }
default: { default: {
@ -1554,7 +1554,7 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page, bool ledcont
((uint64_t)NrAr_[2]) << 40 | ((uint64_t)NrAr_[2]) << 40 |
((uint64_t)NrAr_[1]) << 48 | ((uint64_t)NrAr_[1]) << 48 |
((uint64_t)NrAr_[0]) << 56 ((uint64_t)NrAr_[0]) << 56
; ;
break; break;
} }
@ -1569,7 +1569,7 @@ void WritePageHitagS(hitag_function htf, hitag_data *htd, int page, bool ledcont
((uint64_t)key_[2]) << 24 | ((uint64_t)key_[2]) << 24 |
((uint64_t)key_[1]) << 32 | ((uint64_t)key_[1]) << 32 |
((uint64_t)key_[0]) << 40 ((uint64_t)key_[0]) << 40
; ;
break; break;
} }
default: { default: {

2
armsrc/mifarecmd.c
View file

@ -2611,7 +2611,7 @@ void MifareG4ReadBlk(uint8_t blockno, uint8_t *pwd) {
LED_B_ON(); LED_B_ON();
uint32_t save_iso14a_timeout = iso14a_get_timeout(); uint32_t save_iso14a_timeout = iso14a_get_timeout();
iso14a_set_timeout(13560000 / 1000 / (8 * 16) * 1000); // 2 seconds timeout iso14a_set_timeout(13560000 / 1000 / (8 * 16) * 1000); // 2 seconds timeout
uint8_t cmd[] = { 0xCF, 0x00, 0x00, 0x00, 0x00, 0xCE, blockno, 0x00, 0x00}; uint8_t cmd[] = { 0xCF, 0x00, 0x00, 0x00, 0x00, 0xCE, blockno, 0x00, 0x00};
memcpy(cmd + 1, pwd, 4); memcpy(cmd + 1, pwd, 4);

2
client/src/cmdlfguard.c
View file

@ -27,7 +27,7 @@
static int CmdHelp(const char *Cmd); static int CmdHelp(const char *Cmd);
static int demod_guard_raw(uint8_t* raw, uint8_t rlen) { static int demod_guard_raw(uint8_t *raw, uint8_t rlen) {
if (rlen != 12) { if (rlen != 12) {
return PM3_EINVARG; return PM3_EINVARG;