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

fix coverity and style

Browse source
This commit is contained in:
iceman1001 2022-06-30 23:28:09 +02:00
commit cc93354148
1 changed files with 95 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

98
client/src/cmdhfxerox.c
View file

@ -36,23 +36,23 @@
} \ } \
} }
#define l2c(l,c) (*((c)++)=(unsigned char)(((l) )&0xff), \ #define l2c(l,c) (*((c)++) = (uint8_t)(((l)) & 0xff), \
*((c)++)=(unsigned char)(((l)>> 8L)&0xff), \ *((c)++) = (uint8_t)(((l) >> 8L) & 0xff), \
*((c)++)=(unsigned char)(((l)>>16L)&0xff), \ *((c)++) = (uint8_t)(((l) >> 16L) & 0xff), \
*((c)++)=(unsigned char)(((l)>>24L)&0xff)) *((c)++) = (uint8_t)(((l) >> 24L) & 0xff))
/* NOTE - c is not incremented as per l2c */ /* NOTE - c is not incremented as per l2c */
#define l2cn(l1,l2,c,n) { \ #define l2cn(l1,l2,c,n) { \
c += n; \ c += n; \
switch (n) { \ switch (n) { \
case 8: *(--(c))=(unsigned char)(((l2)>>24L)&0xff); \ case 8: *(--(c)) = (uint8_t)(((l2) >> 24L) & 0xff); \
case 7: *(--(c))=(unsigned char)(((l2)>>16L)&0xff); \ case 7: *(--(c)) = (uint8_t)(((l2) >> 16L) & 0xff); \
case 6: *(--(c))=(unsigned char)(((l2)>> 8L)&0xff); \ case 6: *(--(c)) = (uint8_t)(((l2) >> 8L) & 0xff); \
case 5: *(--(c))=(unsigned char)(((l2) )&0xff); \ case 5: *(--(c)) = (uint8_t)(((l2)) & 0xff); \
case 4: *(--(c))=(unsigned char)(((l1)>>24L)&0xff); \ case 4: *(--(c)) = (uint8_t)(((l1) >> 24L) & 0xff); \
case 3: *(--(c))=(unsigned char)(((l1)>>16L)&0xff); \ case 3: *(--(c)) = (uint8_t)(((l1) >> 16L) & 0xff); \
case 2: *(--(c))=(unsigned char)(((l1)>> 8L)&0xff); \ case 2: *(--(c)) = (uint8_t)(((l1) >> 8L) & 0xff); \
case 1: *(--(c))=(unsigned char)(((l1) )&0xff); \ case 1: *(--(c)) = (uint8_t)(((l1)) & 0xff); \
} \ } \
} }
@ -76,14 +76,14 @@
#define l2nn(l1,l2,c,n) { \ #define l2nn(l1,l2,c,n) { \
c+=n; \ c+=n; \
switch (n) { \ switch (n) { \
case 8: *(--(c))=(unsigned char)(((l2) )&0xff); \ case 8: *(--(c)) = (uint8_t)(((l2)) & 0xff); \
case 7: *(--(c))=(unsigned char)(((l2)>> 8)&0xff); \ case 7: *(--(c)) = (uint8_t)(((l2) >> 8) & 0xff); \
case 6: *(--(c))=(unsigned char)(((l2)>>16)&0xff); \ case 6: *(--(c)) = (uint8_t)(((l2) >> 16) & 0xff); \
case 5: *(--(c))=(unsigned char)(((l2)>>24)&0xff); \ case 5: *(--(c)) = (uint8_t)(((l2) >> 24) & 0xff); \
case 4: *(--(c))=(unsigned char)(((l1) )&0xff); \ case 4: *(--(c)) = (uint8_t)(((l1)) & 0xff); \
case 3: *(--(c))=(unsigned char)(((l1)>> 8)&0xff); \ case 3: *(--(c)) = (uint8_t)(((l1) >> 8) & 0xff); \
case 2: *(--(c))=(unsigned char)(((l1)>>16)&0xff); \ case 2: *(--(c)) = (uint8_t)(((l1) >> 16) & 0xff); \
case 1: *(--(c))=(unsigned char)(((l1)>>24)&0xff); \ case 1: *(--(c)) = (uint8_t)(((l1) >> 24) & 0xff); \
} \ } \
} }
@ -92,10 +92,10 @@
l |= ((unsigned long)(*((c)++))) << 8L, \ l |= ((unsigned long)(*((c)++))) << 8L, \
l |= ((unsigned long)(*((c)++)))) l |= ((unsigned long)(*((c)++))))
#define l2n(l,c) (*((c)++)=(unsigned char)(((l)>>24L)&0xff), \ #define l2n(l,c) (*((c)++) = (uint8_t)(((l) >> 24L) & 0xff), \
*((c)++)=(unsigned char)(((l)>>16L)&0xff), \ *((c)++) = (uint8_t)(((l) >> 16L) & 0xff), \
*((c)++)=(unsigned char)(((l)>> 8L)&0xff), \ *((c)++) = (uint8_t)(((l) >> 8L) & 0xff), \
*((c)++)=(unsigned char)(((l) )&0xff)) *((c)++) = (uint8_t)(((l)) & 0xff))
#define C_RC2(n) \ #define C_RC2(n) \
t = (x0 + (x1 & ~x3) + (x2 & x3) + *(p0++)) & 0xffff; \ t = (x0 + (x1 & ~x3) + (x2 & x3) + *(p0++)) & 0xffff; \
@ -116,7 +116,7 @@ typedef struct rc2_key_st {
RC2_INT data[64]; RC2_INT data[64];
} RC2_KEY; } RC2_KEY;
static const unsigned char key_table[256] = { static const uint8_t lut[256] = {
0xd9, 0x78, 0xf9, 0xc4, 0x19, 0xdd, 0xb5, 0xed, 0x28, 0xe9, 0xfd, 0x79, 0xd9, 0x78, 0xf9, 0xc4, 0x19, 0xdd, 0xb5, 0xed, 0x28, 0xe9, 0xfd, 0x79,
0x4a, 0xa0, 0xd8, 0x9d, 0xc6, 0x7e, 0x37, 0x83, 0x2b, 0x76, 0x53, 0x8e, 0x4a, 0xa0, 0xd8, 0x9d, 0xc6, 0x7e, 0x37, 0x83, 0x2b, 0x76, 0x53, 0x8e,
0x62, 0x4c, 0x64, 0x88, 0x44, 0x8b, 0xfb, 0xa2, 0x17, 0x9a, 0x59, 0xf5, 0x62, 0x4c, 0x64, 0x88, 0x44, 0x8b, 0xfb, 0xa2, 0x17, 0x9a, 0x59, 0xf5,
@ -141,7 +141,7 @@ static const unsigned char key_table[256] = {
0xfe, 0x7f, 0xc1, 0xad, 0xfe, 0x7f, 0xc1, 0xad,
}; };
static const unsigned char var_list[] = {0x1c, 0x1e, 0x20, 0x26, 0x28, 0x2a, 0x2c, 0x2e}; static const uint8_t var_list[] = {0x1c, 0x1e, 0x20, 0x26, 0x28, 0x2a, 0x2c, 0x2e};
static int CmdHelp(const char *Cmd); static int CmdHelp(const char *Cmd);
@ -162,8 +162,10 @@ void RC2_set_key(RC2_KEY *key, int len, const unsigned char *data, int bits) {
if (len > 128) if (len > 128)
len = 128; len = 128;
if (bits <= 0) if (bits <= 0)
bits = 1024; bits = 1024;
if (bits > 1024) if (bits > 1024)
bits = 1024; bits = 1024;
@ -174,7 +176,7 @@ void RC2_set_key(RC2_KEY *key, int len, const unsigned char *data, int bits) {
d = k[len - 1]; d = k[len - 1];
j = 0; j = 0;
for (i = len; i < 128; i++, j++) { for (i = len; i < 128; i++, j++) {
d = key_table[(k[j] + d) & 0xff]; d = lut[(k[j] + d) & 0xff];
k[i] = d; k[i] = d;
} }
@ -184,10 +186,10 @@ void RC2_set_key(RC2_KEY *key, int len, const unsigned char *data, int bits) {
i = 128 - j; i = 128 - j;
c = (0xff >> (-bits & 0x07)); c = (0xff >> (-bits & 0x07));
d = key_table[k[i] & c]; d = lut[k[i] & c];
k[i] = d; k[i] = d;
while (i--) { while (i--) {
d = key_table[k[i + j] ^ d]; d = lut[k[i + j] ^ d];
k[i] = d; k[i] = d;
} }
@ -268,7 +270,9 @@ void RC2_decrypt(unsigned long *d, RC2_KEY *key) {
x0 = (t - (x1 & ~x3) - (x2 & x3) - * (p0--)) & 0xffff; x0 = (t - (x1 & ~x3) - (x2 & x3) - * (p0--)) & 0xffff;
if (--i == 0) { if (--i == 0) {
if (--n == 0) break; if (--n == 0)
break;
i = (n == 2) ? 6 : 5; i = (n == 2) ? 6 : 5;
x3 = (x3 - p1[x2 & 0x3f]) & 0xffff; x3 = (x3 - p1[x2 & 0x3f]) & 0xffff;
@ -290,9 +294,11 @@ void RC2_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
unsigned long tin[2]; unsigned long tin[2];
if (encrypt) { if (encrypt) {
c2l(iv, tout0); c2l(iv, tout0);
c2l(iv, tout1); c2l(iv, tout1);
iv -= 8; iv -= 8;
for (l -= 8; l >= 0; l -= 8) { for (l -= 8; l >= 0; l -= 8) {
c2l(in, tin0); c2l(in, tin0);
c2l(in, tin1); c2l(in, tin1);
@ -306,6 +312,7 @@ void RC2_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
tout1 = tin[1]; tout1 = tin[1];
l2c(tout1, out); l2c(tout1, out);
} }
if (l != -8) { if (l != -8) {
c2ln(in, tin0, tin1, l + 8); c2ln(in, tin0, tin1, l + 8);
tin0 ^= tout0; tin0 ^= tout0;
@ -318,12 +325,16 @@ void RC2_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
tout1 = tin[1]; tout1 = tin[1];
l2c(tout1, out); l2c(tout1, out);
} }
l2c(tout0, iv); l2c(tout0, iv);
l2c(tout1, iv); l2c(tout1, iv);
} else { } else {
c2l(iv, xor0); c2l(iv, xor0);
c2l(iv, xor1); c2l(iv, xor1);
iv -= 8; iv -= 8;
for (l -= 8; l >= 0; l -= 8) { for (l -= 8; l >= 0; l -= 8) {
c2l(in, tin0); c2l(in, tin0);
tin[0] = tin0; tin[0] = tin0;
@ -337,6 +348,7 @@ void RC2_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
xor0 = tin0; xor0 = tin0;
xor1 = tin1; xor1 = tin1;
} }
if (l != -8) { if (l != -8) {
c2l(in, tin0); c2l(in, tin0);
tin[0] = tin0; tin[0] = tin0;
@ -349,6 +361,7 @@ void RC2_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
xor0 = tin0; xor0 = tin0;
xor1 = tin1; xor1 = tin1;
} }
l2c(xor0, iv); l2c(xor0, iv);
l2c(xor1, iv); l2c(xor1, iv);
} }
@ -371,7 +384,7 @@ static int switch_off_field(void) {
static int findXerox(iso14b_card_select_t *card, bool disconnect) { static int findXerox(iso14b_card_select_t *card, bool disconnect) {
if (card == NULL) if (card == NULL)
return false; return PM3_EINVARG;
int8_t retry = 3; int8_t retry = 3;
while (retry--) { while (retry--) {
@ -385,11 +398,7 @@ static int findXerox(iso14b_card_select_t *card, bool disconnect) {
SendCommandNG(CMD_HF_ISO14443B_COMMAND, (uint8_t *)&packet, sizeof(iso14b_raw_cmd_t)); SendCommandNG(CMD_HF_ISO14443B_COMMAND, (uint8_t *)&packet, sizeof(iso14b_raw_cmd_t));
PacketResponseNG resp; PacketResponseNG resp;
if (WaitForResponseTimeout(CMD_HF_ISO14443B_COMMAND, &resp, TIMEOUT)) { if (WaitForResponseTimeout(CMD_HF_ISO14443B_COMMAND, &resp, TIMEOUT)) {
/*
PrintAndLogEx(INFO, "%X %X %X %X %X %I64X %I64X %I64X %X %X %X %c",
resp.cmd, resp.length, resp.magic, resp.status, resp.crc, resp.oldarg[0], resp.oldarg[1], resp.oldarg[2],
resp.data.asBytes[0], resp.data.asBytes[1], resp.data.asBytes[2], resp.ng ? 't' : 'f');
*/
if (resp.oldarg[0] == 0) { if (resp.oldarg[0] == 0) {
memcpy(card, (iso14b_card_select_t *)resp.data.asBytes, sizeof(iso14b_card_select_t)); memcpy(card, (iso14b_card_select_t *)resp.data.asBytes, sizeof(iso14b_card_select_t));
} }
@ -399,13 +408,15 @@ static int findXerox(iso14b_card_select_t *card, bool disconnect) {
// switch_off_field(); // switch_off_field();
PrintAndLogEx(FAILED, "command execution timeout"); PrintAndLogEx(FAILED, "command execution timeout");
return -1; return PM3_ESOFT;
} }
static uint8_t info_blocks[] = { 0x15, 0x16, 0x17, 0x18, 0x22 }; static uint8_t info_blocks[] = { 0x15, 0x16, 0x17, 0x18, 0x22 };
static const char *c_type[] = { "drum", "yellow", "magenta", "cyan", "black" }; static const char *c_type[] = { "drum", "yellow", "magenta", "cyan", "black" };
static inline char dec_digit(uint8_t dig) { return (dig <= 9) ? dig + '0' : '?'; } static inline char dec_digit(uint8_t dig) {
return (dig <= 9) ? dig + '0' : '?';
}
static void gen_pn(uint8_t *data, char *pn) { static void gen_pn(uint8_t *data, char *pn) {
pn[0] = dec_digit(data[0] >> 4); pn[0] = dec_digit(data[0] >> 4);
@ -443,9 +454,11 @@ static int CmdHFXeroxInfo(const char *Cmd) {
iso14b_card_select_t card; iso14b_card_select_t card;
int status = findXerox(&card, false); int status = findXerox(&card, false);
if (status != 0) { if (status != PM3_SUCCESS) {
switch_off_field(); switch_off_field();
if (verbose) PrintAndLogEx(FAILED, "Fuji/Xerox tag select failed"); if (verbose) {
PrintAndLogEx(FAILED, "Fuji/Xerox tag select failed");
}
return PM3_ERFTRANS; return PM3_ERFTRANS;
} }
@ -555,7 +568,8 @@ static int CmdHFXeroxDump(const char *Cmd) {
iso14b_card_select_t card; iso14b_card_select_t card;
int status = findXerox(&card, false); // remain RF on int status = findXerox(&card, false); // remain RF on
if (status != 0) { if (status != PM3_SUCCESS) {
free(packet);
switch_off_field(); switch_off_field();
return PM3_ERFTRANS; return PM3_ERFTRANS;
} }
@ -718,7 +732,7 @@ static int CmdHFXeroxDump(const char *Cmd) {
size_t datalen = blocknum * 4; size_t datalen = blocknum * 4;
saveFile(filename, ".bin", data, datalen); saveFile(filename, ".bin", data, datalen);
// saveFileEML(filename, data, datalen, 4); saveFileEML(filename, data, datalen, 4);
// saveFileJSON(filename, jsf15, data, datalen, NULL); // saveFileJSON(filename, jsf15, data, datalen, NULL);
return PM3_SUCCESS; return PM3_SUCCESS;
} }