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

style

Browse source
This commit is contained in:
iceman1001 2019-04-11 07:40:50 +02:00
commit 7547952a4d
4 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/cmdlfhid.c
View file

@ -200,7 +200,7 @@ int CmdHIDDemod(const char *Cmd) {
cardnum = (lo >> 1) & 0xFFFFF; cardnum = (lo >> 1) & 0xFFFFF;
fc = ((hi & 1) << 11) | (lo >> 21); fc = ((hi & 1) << 11) | (lo >> 21);
} }
if(fmtLen==36){ if (fmtLen == 36) {
oem = (lo >> 1) & 0x3; oem = (lo >> 1) & 0x3;
cardnum = (lo >> 3) & 0xFFFF; cardnum = (lo >> 3) & 0xFFFF;
fc = (hi & 0x7) << 13 | ((lo >> 19) & 0xFFFF); fc = (hi & 0x7) << 13 | ((lo >> 19) & 0xFFFF);
@ -218,7 +218,7 @@ int CmdHIDDemod(const char *Cmd) {
PrintAndLogEx(SUCCESS, "HID Prox TAG (Kastle format) ID: %08x (%u) - Format Len: 32bit - CC: %u - FC: %u - Card: %u", lo, (lo >> 1) & 0xFFFF, cc, fc, cardnum); PrintAndLogEx(SUCCESS, "HID Prox TAG (Kastle format) ID: %08x (%u) - Format Len: 32bit - CC: %u - FC: %u - Card: %u", lo, (lo >> 1) & 0xFFFF, cc, fc, cardnum);
} else { } else {
PrintAndLogEx(SUCCESS, "HID Prox TAG ID: %x%08x (%u) - Format Len: %ubit - OEM: %03u - FC: %u - Card: %u", PrintAndLogEx(SUCCESS, "HID Prox TAG ID: %x%08x (%u) - Format Len: %ubit - OEM: %03u - FC: %u - Card: %u",
hi, lo, cardnum, fmtLen, oem, fc, cardnum); hi, lo, cardnum, fmtLen, oem, fc, cardnum);
} }
} }
@ -405,7 +405,7 @@ static void calc34(uint16_t fc, uint32_t cardno, uint8_t *out) {
// *lo = ((cardno & 0xFFFFF) << 1) | fc << 21; // *lo = ((cardno & 0xFFFFF) << 1) | fc << 21;
// *hi = (1 << 5) | ((fc >> 11) & 1); // *hi = (1 << 5) | ((fc >> 11) & 1);
// } // }
static void calc36(uint8_t oem, uint16_t fc, uint32_t cardno, uint8_t *out){ static void calc36(uint8_t oem, uint16_t fc, uint32_t cardno, uint8_t *out) {
// FC 1 - 16 - 16 bit // FC 1 - 16 - 16 bit
// cardno 17 - 33 - 16 bit // cardno 17 - 33 - 16 bit
// oem 34 - 35 - 2 bit // oem 34 - 35 - 2 bit

2
client/cmdtrace.c
View file

@ -68,7 +68,7 @@ static bool next_record_is_response(uint16_t tracepos, uint8_t *trace) {
} }
static bool merge_topaz_reader_frames(uint32_t timestamp, uint32_t *duration, uint16_t *tracepos, uint16_t traceLen, static bool merge_topaz_reader_frames(uint32_t timestamp, uint32_t *duration, uint16_t *tracepos, uint16_t traceLen,
uint8_t *trace, uint8_t *frame, uint8_t *topaz_reader_command, uint16_t *data_len) { uint8_t *trace, uint8_t *frame, uint8_t *topaz_reader_command, uint16_t *data_len) {
#define MAX_TOPAZ_READER_CMD_LEN 16 #define MAX_TOPAZ_READER_CMD_LEN 16

2
client/emv/apduinfo.c
View file

@ -277,7 +277,7 @@ int CodeCmp(const char *code1, const char *code2) {
return -1; return -1;
} }
const APDUCode * GetAPDUCode(uint8_t sw1, uint8_t sw2) { const APDUCode *GetAPDUCode(uint8_t sw1, uint8_t sw2) {
char buf[6] = {0}; char buf[6] = {0};
int res; int res;
int mineq = APDUCodeTableLen; int mineq = APDUCodeTableLen;

7
client/util.c
View file

@ -752,12 +752,11 @@ void wiegand_add_parity(uint8_t *target, uint8_t *source, uint8_t length) {
} }
// add HID parity to binary array: ODD prefix for 1st half of ID, EVEN suffix for 2nd half // add HID parity to binary array: ODD prefix for 1st half of ID, EVEN suffix for 2nd half
void wiegand_add_parity_swapped(uint8_t *target, uint8_t *source, uint8_t length) void wiegand_add_parity_swapped(uint8_t *target, uint8_t *source, uint8_t length) {
{ *(target++) = GetParity(source, ODD, length / 2);
*(target++)= GetParity(source, ODD, length / 2);
memcpy(target, source, length); memcpy(target, source, length);
target += length; target += length;
*(target)= GetParity(source + length / 2, EVEN, length / 2); *(target) = GetParity(source + length / 2, EVEN, length / 2);
} }
// xor two arrays together for len items. The dst array contains the new xored values. // xor two arrays together for len items. The dst array contains the new xored values.