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

style

Browse source
This commit is contained in:
iceman1001 2019-09-19 10:47:12 +02:00
commit 895410aec0
13 changed files with 714 additions and 714 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/cmdlfnedap.c
View file

@ -480,7 +480,7 @@ int CmdLFNedapClone(const char *Cmd) {
if (i == 0) { if (i == 0) {
SetConfigWithBlock0(blocks[0]); SetConfigWithBlock0(blocks[0]);
if ( t55xxAquireAndCompareBlock0(false, 0, blocks[0], false) ) if (t55xxAquireAndCompareBlock0(false, 0, blocks[0], false))
continue; continue;
} }
@ -488,7 +488,7 @@ int CmdLFNedapClone(const char *Cmd) {
res++; res++;
} }
if ( res == 0 ) if (res == 0)
PrintAndLogEx(SUCCESS, "Success writing to tag"); PrintAndLogEx(SUCCESS, "Success writing to tag");
else { else {
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");

4
client/cmdlfnoralsy.c
View file

@ -179,7 +179,7 @@ static int CmdNoralsyClone(const char *Cmd) {
if (i == 0) { if (i == 0) {
SetConfigWithBlock0(blocks[0]); SetConfigWithBlock0(blocks[0]);
if ( t55xxAquireAndCompareBlock0(false, 0, blocks[0], false) ) if (t55xxAquireAndCompareBlock0(false, 0, blocks[0], false))
continue; continue;
} }
@ -187,7 +187,7 @@ static int CmdNoralsyClone(const char *Cmd) {
res++; res++;
} }
if ( res == 0 ) if (res == 0)
PrintAndLogEx(SUCCESS, "Success writing to tag"); PrintAndLogEx(SUCCESS, "Success writing to tag");
return PM3_SUCCESS; return PM3_SUCCESS;

4
client/cmdlfpresco.c
View file

@ -146,7 +146,7 @@ static int CmdPrescoClone(const char *Cmd) {
if (i == 0) { if (i == 0) {
SetConfigWithBlock0(blocks[0]); SetConfigWithBlock0(blocks[0]);
if ( t55xxAquireAndCompareBlock0(false, 0, blocks[0], false) ) if (t55xxAquireAndCompareBlock0(false, 0, blocks[0], false))
continue; continue;
} }
@ -155,7 +155,7 @@ static int CmdPrescoClone(const char *Cmd) {
} }
if ( res == 0 ) if (res == 0)
PrintAndLogEx(SUCCESS, "Success writing to tag"); PrintAndLogEx(SUCCESS, "Success writing to tag");
return PM3_SUCCESS; return PM3_SUCCESS;

4
client/cmdlfpyramid.c
View file

@ -256,7 +256,7 @@ static int CmdPyramidClone(const char *Cmd) {
if (i == 0) { if (i == 0) {
SetConfigWithBlock0(blocks[0]); SetConfigWithBlock0(blocks[0]);
if ( t55xxAquireAndCompareBlock0(false, 0, blocks[0], false) ) if (t55xxAquireAndCompareBlock0(false, 0, blocks[0], false))
continue; continue;
} }
@ -265,7 +265,7 @@ static int CmdPyramidClone(const char *Cmd) {
} }
if ( res == 0 ) if (res == 0)
PrintAndLogEx(SUCCESS, "Success writing to tag"); PrintAndLogEx(SUCCESS, "Success writing to tag");
return PM3_SUCCESS; return PM3_SUCCESS;

2
client/cmdlfviking.c
View file

@ -97,7 +97,7 @@ static int CmdVikingClone(const char *Cmd) {
clearCommandBuffer(); clearCommandBuffer();
SendCommandNG(CMD_LF_VIKING_CLONE, (uint8_t*)&payload, sizeof(payload)); SendCommandNG(CMD_LF_VIKING_CLONE, (uint8_t *)&payload, sizeof(payload));
PacketResponseNG resp; PacketResponseNG resp;
if (!WaitForResponseTimeout(CMD_LF_VIKING_CLONE, &resp, T55XX_WRITE_TIMEOUT)) { if (!WaitForResponseTimeout(CMD_LF_VIKING_CLONE, &resp, T55XX_WRITE_TIMEOUT)) {
PrintAndLogEx(ERR, "Error occurred, device did not respond during write operation."); PrintAndLogEx(ERR, "Error occurred, device did not respond during write operation.");

4
client/cmdlfvisa2000.c
View file

@ -193,7 +193,7 @@ static int CmdVisa2kClone(const char *Cmd) {
if (i == 0) { if (i == 0) {
SetConfigWithBlock0(blocks[0]); SetConfigWithBlock0(blocks[0]);
if ( t55xxAquireAndCompareBlock0(false, 0, blocks[0], false) ) if (t55xxAquireAndCompareBlock0(false, 0, blocks[0], false))
continue; continue;
} }
@ -201,7 +201,7 @@ static int CmdVisa2kClone(const char *Cmd) {
res++; res++;
} }
if ( res == 0 ) if (res == 0)
PrintAndLogEx(SUCCESS, "Success writing to tag"); PrintAndLogEx(SUCCESS, "Success writing to tag");
return PM3_SUCCESS; return PM3_SUCCESS;

18
client/cmdwiegand.c
View file

@ -52,18 +52,18 @@ static int usage_wiegand_decode() {
return PM3_SUCCESS; return PM3_SUCCESS;
} }
void PrintTagId(wiegand_message_t *packed){ void PrintTagId(wiegand_message_t *packed) {
if (packed->Top != 0) { if (packed->Top != 0) {
PrintAndLogEx(SUCCESS, "Card ID: %X%08X%08X", PrintAndLogEx(SUCCESS, "Card ID: %X%08X%08X",
(uint32_t)packed->Top, (uint32_t)packed->Top,
(uint32_t)packed->Mid, (uint32_t)packed->Mid,
(uint32_t)packed->Bot) (uint32_t)packed->Bot)
; ;
} else { } else {
PrintAndLogEx(SUCCESS, "Card ID: %X%08X", PrintAndLogEx(SUCCESS, "Card ID: %X%08X",
(uint32_t)packed->Mid, (uint32_t)packed->Mid,
(uint32_t)packed->Bot) (uint32_t)packed->Bot)
; ;
} }
} }
@ -152,7 +152,7 @@ int CmdWiegandDecode(const char *Cmd) {
while (param_getchar(Cmd, cmdp) != 0x00 && !errors) { while (param_getchar(Cmd, cmdp) != 0x00 && !errors) {
uint32_t strlen = param_getlength(Cmd, cmdp); uint32_t strlen = param_getlength(Cmd, cmdp);
strlen++; // null termin strlen++; // null termin
if ( strlen > 2 ) { if (strlen > 2) {
char *s = calloc(strlen, sizeof(uint8_t)); char *s = calloc(strlen, sizeof(uint8_t));
param_getstr(Cmd, cmdp, s, strlen); param_getstr(Cmd, cmdp, s, strlen);
hexstring_to_u96(&top, &mid, &bot, s); hexstring_to_u96(&top, &mid, &bot, s);

4
client/util.c
View file

@ -885,10 +885,10 @@ char *strmcopy(const char *buf) {
* *
* Returns the number of nibbles (4 bits) entered. * Returns the number of nibbles (4 bits) entered.
*/ */
int hexstring_to_u96(uint32_t* hi2, uint32_t* hi, uint32_t* lo, const char* str) { int hexstring_to_u96(uint32_t *hi2, uint32_t *hi, uint32_t *lo, const char *str) {
int n = 0, i = 0; int n = 0, i = 0;
while (sscanf(&str[i++], "%1x", &n ) == 1) { while (sscanf(&str[i++], "%1x", &n) == 1) {
*hi2 = (*hi2 << 4) | (*hi >> 28); *hi2 = (*hi2 << 4) | (*hi >> 28);
*hi = (*hi << 4) | (*lo >> 28); *hi = (*hi << 4) | (*lo >> 28);
*lo = (*lo << 4) | (n & 0xf); *lo = (*lo << 4) | (n & 0xf);

2
client/util.h
View file

@ -98,5 +98,5 @@ void clean_ascii(unsigned char *buf, size_t len);
void strcleanrn(char *buf, size_t len); void strcleanrn(char *buf, size_t len);
void strcreplace(char *buf, size_t len, char from, char to); void strcreplace(char *buf, size_t len, char from, char to);
char *strmcopy(const char *buf); char *strmcopy(const char *buf);
int hexstring_to_u96(uint32_t* hi2, uint32_t* hi, uint32_t* lo, const char* str); int hexstring_to_u96(uint32_t *hi2, uint32_t *hi, uint32_t *lo, const char *str);
#endif #endif

902
client/wiegand_formats.c
View file

File diff suppressed because it is too large Load diff

24
client/wiegand_formats.h
View file

@ -23,26 +23,26 @@
#include "ui.h" #include "ui.h"
typedef struct { typedef struct {
bool hasCardNumber; bool hasCardNumber;
bool hasFacilityCode; bool hasFacilityCode;
bool hasIssueLevel; bool hasIssueLevel;
bool hasOEMCode; bool hasOEMCode;
bool hasParity; bool hasParity;
} cardformatdescriptor_t; } cardformatdescriptor_t;
// Structure for defined Wiegand card formats available for packing/unpacking // Structure for defined Wiegand card formats available for packing/unpacking
typedef struct { typedef struct {
const char* Name; const char *Name;
bool (*Pack)(wiegand_card_t* card, wiegand_message_t* packed); bool (*Pack)(wiegand_card_t *card, wiegand_message_t *packed);
bool (*Unpack)(wiegand_message_t* packed, wiegand_card_t* card); bool (*Unpack)(wiegand_message_t *packed, wiegand_card_t *card);
const char* Descrp; const char *Descrp;
cardformatdescriptor_t Fields; cardformatdescriptor_t Fields;
} cardformat_t; } cardformat_t;
void HIDListFormats(); void HIDListFormats();
int HIDFindCardFormat(const char *format); int HIDFindCardFormat(const char *format);
cardformat_t HIDGetCardFormat(int idx); cardformat_t HIDGetCardFormat(int idx);
bool HIDPack(int FormatIndex, wiegand_card_t* card, wiegand_message_t* packed); bool HIDPack(int FormatIndex, wiegand_card_t *card, wiegand_message_t *packed);
bool HIDTryUnpack(wiegand_message_t* packed, bool ignoreParity); bool HIDTryUnpack(wiegand_message_t *packed, bool ignoreParity);
#endif #endif

240
client/wiegand_formatutils.c
View file

@ -15,44 +15,44 @@
#include "wiegand_formatutils.h" #include "wiegand_formatutils.h"
#include "ui.h" #include "ui.h"
bool get_bit_by_position(wiegand_message_t* data, uint8_t pos){ bool get_bit_by_position(wiegand_message_t *data, uint8_t pos) {
if (pos >= data->Length) return false; if (pos >= data->Length) return false;
pos = (data->Length - pos) - 1; // invert ordering; Indexing goes from 0 to 1. Subtract 1 for weight of bit. pos = (data->Length - pos) - 1; // invert ordering; Indexing goes from 0 to 1. Subtract 1 for weight of bit.
bool result = false; bool result = false;
if (pos > 95) if (pos > 95)
result = false; result = false;
else if (pos > 63) else if (pos > 63)
result = (data->Top >> (pos - 64)) & 1; result = (data->Top >> (pos - 64)) & 1;
else if (pos > 31) else if (pos > 31)
result = (data->Mid >> (pos - 32)) & 1; result = (data->Mid >> (pos - 32)) & 1;
else else
result = (data->Bot >> pos) & 1; result = (data->Bot >> pos) & 1;
return result; return result;
} }
bool set_bit_by_position(wiegand_message_t* data, bool value, uint8_t pos){ bool set_bit_by_position(wiegand_message_t *data, bool value, uint8_t pos) {
if (pos >= data->Length) return false; if (pos >= data->Length) return false;
pos = (data->Length - pos) - 1; // invert ordering; Indexing goes from 0 to 1. Subtract 1 for weight of bit. pos = (data->Length - pos) - 1; // invert ordering; Indexing goes from 0 to 1. Subtract 1 for weight of bit.
if (pos > 95) { if (pos > 95) {
return false; return false;
} else if (pos > 63) { } else if (pos > 63) {
if (value) if (value)
data->Top |= (1 << (pos - 64)); data->Top |= (1 << (pos - 64));
else else
data->Top &= ~(1 << (pos - 64)); data->Top &= ~(1 << (pos - 64));
return true; return true;
} else if (pos > 31) { } else if (pos > 31) {
if (value) if (value)
data->Mid |= (1 << (pos - 32)); data->Mid |= (1 << (pos - 32));
else else
data->Mid &= ~(1 << (pos - 32)); data->Mid &= ~(1 << (pos - 32));
return true; return true;
} else { } else {
if (value) if (value)
data->Bot |= (1 << pos); data->Bot |= (1 << pos);
else else
data->Bot &= ~(1 << pos); data->Bot &= ~(1 << pos);
return true; return true;
} }
} }
/** /**
* Safeguard the data by doing a manual deep copy * Safeguard the data by doing a manual deep copy
@ -64,11 +64,11 @@ bool set_bit_by_position(wiegand_message_t* data, bool value, uint8_t pos){
* If the definition of the wiegand_message struct changes, this function must also * If the definition of the wiegand_message struct changes, this function must also
* be updated to match. * be updated to match.
*/ */
void message_datacopy(wiegand_message_t* src, wiegand_message_t* dest){ void message_datacopy(wiegand_message_t *src, wiegand_message_t *dest) {
dest->Bot = src->Bot; dest->Bot = src->Bot;
dest->Mid = src->Mid; dest->Mid = src->Mid;
dest->Top = src->Top; dest->Top = src->Top;
dest->Length = src->Length; dest->Length = src->Length;
} }
/** /**
* *
@ -77,40 +77,40 @@ void message_datacopy(wiegand_message_t* src, wiegand_message_t* dest){
* until all the bugs shaken from the block/chunk version of the code. * until all the bugs shaken from the block/chunk version of the code.
* *
*/ */
uint64_t get_linear_field(wiegand_message_t* data, uint8_t firstBit, uint8_t length){ uint64_t get_linear_field(wiegand_message_t *data, uint8_t firstBit, uint8_t length) {
uint64_t result = 0; uint64_t result = 0;
for (uint8_t i = 0; i < length; i++ ) { for (uint8_t i = 0; i < length; i++) {
result = (result << 1) | get_bit_by_position(data, firstBit + i); result = (result << 1) | get_bit_by_position(data, firstBit + i);
} }
return result; return result;
} }
bool set_linear_field(wiegand_message_t* data, uint64_t value, uint8_t firstBit, uint8_t length){ bool set_linear_field(wiegand_message_t *data, uint64_t value, uint8_t firstBit, uint8_t length) {
wiegand_message_t tmpdata; wiegand_message_t tmpdata;
message_datacopy(data, &tmpdata); message_datacopy(data, &tmpdata);
bool result = true; bool result = true;
for (int i = 0; i < length; i++){ for (int i = 0; i < length; i++) {
result &= set_bit_by_position(&tmpdata, (value >> ((length - i) - 1)) & 1, firstBit + i); result &= set_bit_by_position(&tmpdata, (value >> ((length - i) - 1)) & 1, firstBit + i);
} }
if (result) if (result)
message_datacopy(&tmpdata, data); message_datacopy(&tmpdata, data);
return result; return result;
} }
uint64_t get_nonlinear_field(wiegand_message_t* data, uint8_t numBits, uint8_t* bits){ uint64_t get_nonlinear_field(wiegand_message_t *data, uint8_t numBits, uint8_t *bits) {
uint64_t result = 0; uint64_t result = 0;
for (int i = 0; i < numBits; i++){ for (int i = 0; i < numBits; i++) {
result = (result << 1) | (get_bit_by_position(data, *(bits+i)) & 1); result = (result << 1) | (get_bit_by_position(data, *(bits + i)) & 1);
} }
return result; return result;
} }
bool set_nonlinear_field(wiegand_message_t* data, uint64_t value, uint8_t numBits, uint8_t* bits){ bool set_nonlinear_field(wiegand_message_t *data, uint64_t value, uint8_t numBits, uint8_t *bits) {
wiegand_message_t tmpdata; wiegand_message_t tmpdata;
message_datacopy(data, &tmpdata); message_datacopy(data, &tmpdata);
bool result = true; bool result = true;
for (int i = 0; i < numBits; i++){ for (int i = 0; i < numBits; i++) {
result &= set_bit_by_position(&tmpdata, (value >> ((numBits - i) - 1)) & 1, *(bits + i)); result &= set_bit_by_position(&tmpdata, (value >> ((numBits - i) - 1)) & 1, *(bits + i));
} }
@ -120,66 +120,66 @@ bool set_nonlinear_field(wiegand_message_t* data, uint64_t value, uint8_t numBit
return result; return result;
} }
uint8_t get_length_from_header(wiegand_message_t* data) { uint8_t get_length_from_header(wiegand_message_t *data) {
uint8_t len = 0; uint8_t len = 0;
uint32_t hfmt = 0; // for calculating card length uint32_t hfmt = 0; // for calculating card length
if ((data->Top & 0x000FFFFF) > 0) { // > 64 bits if ((data->Top & 0x000FFFFF) > 0) { // > 64 bits
hfmt = data->Top & 0x000FFFFF; hfmt = data->Top & 0x000FFFFF;
len = 64; len = 64;
} else if ((data->Mid & 0xFFFFFFC0) > 0) { // < 63-38 bits } else if ((data->Mid & 0xFFFFFFC0) > 0) { // < 63-38 bits
hfmt = data->Mid & 0xFFFFFFC0; hfmt = data->Mid & 0xFFFFFFC0;
len = 32; len = 32;
} else if (data->Mid && (data->Mid & 0x00000020) == 0) { // 37 bits; } else if (data->Mid && (data->Mid & 0x00000020) == 0) { // 37 bits;
hfmt = 0; hfmt = 0;
len = 37; len = 37;
} else if ((data->Mid & 0x0000001F) > 0){ // 36-32 bits } else if ((data->Mid & 0x0000001F) > 0) { // 36-32 bits
printf("a\n"); printf("a\n");
hfmt = data->Mid & 0x0000001F; hfmt = data->Mid & 0x0000001F;
len = 32; len = 32;
} else if (data->Top == 0 && data->Mid == 0) { //< 32 bits } else if (data->Top == 0 && data->Mid == 0) { //< 32 bits
hfmt = data->Bot; hfmt = data->Bot;
len = 0; len = 0;
} else { } else {
hfmt = data->Bot; hfmt = data->Bot;
len = 0; len = 0;
} }
while (hfmt > 1) { while (hfmt > 1) {
hfmt >>= 1; hfmt >>= 1;
len++; len++;
} }
return len; return len;
} }
wiegand_message_t initialize_message_object(uint32_t top, uint32_t mid, uint32_t bot){ wiegand_message_t initialize_message_object(uint32_t top, uint32_t mid, uint32_t bot) {
wiegand_message_t result; wiegand_message_t result;
memset(&result, 0, sizeof(wiegand_message_t)); memset(&result, 0, sizeof(wiegand_message_t));
result.Top = top; result.Top = top;
result.Mid = mid; result.Mid = mid;
result.Bot = bot; result.Bot = bot;
result.Length = get_length_from_header(&result); result.Length = get_length_from_header(&result);
return result; return result;
} }
bool add_HID_header(wiegand_message_t* data){ bool add_HID_header(wiegand_message_t *data) {
if (data->Length > 84 || data->Length == 0) return false; // Invalid value if (data->Length > 84 || data->Length == 0) return false; // Invalid value
if (data->Length >= 64){ if (data->Length >= 64) {
data->Top |= 1 << (data->Length - 64); // leading 1: start bit data->Top |= 1 << (data->Length - 64); // leading 1: start bit
data->Top |= 0x09e00000; // Extended-length header data->Top |= 0x09e00000; // Extended-length header
} else if (data->Length > 37){ } else if (data->Length > 37) {
data->Mid |= 1 << (data->Length - 32); // leading 1: start bit data->Mid |= 1 << (data->Length - 32); // leading 1: start bit
data->Top |= 0x09e00000; // Extended-length header data->Top |= 0x09e00000; // Extended-length header
} else if (data->Length == 37){ } else if (data->Length == 37) {
// No header bits added to 37-bit cards // No header bits added to 37-bit cards
} else if (data->Length >= 32){ } else if (data->Length >= 32) {
data->Mid |= 0x20; // Bit 37; standard header data->Mid |= 0x20; // Bit 37; standard header
data->Mid |= 1 << (data->Length - 32); // leading 1: start bit data->Mid |= 1 << (data->Length - 32); // leading 1: start bit
} else { } else {
data->Mid |= 0x20; // Bit 37; standard header data->Mid |= 0x20; // Bit 37; standard header
data->Bot |= 1 << data->Length; // leading 1: start bit data->Bot |= 1 << data->Length; // leading 1: start bit
} }
return true; return true;
} }

32
client/wiegand_formatutils.h
View file

@ -18,32 +18,32 @@
// Structure for packed wiegand messages // Structure for packed wiegand messages
// Always align lowest value (last transmitted) bit to ordinal position 0 (lowest valued bit bottom) // Always align lowest value (last transmitted) bit to ordinal position 0 (lowest valued bit bottom)
typedef struct { typedef struct {
uint8_t Length; // Number of encoded bits in wiegand message (excluding headers and preamble) uint8_t Length; // Number of encoded bits in wiegand message (excluding headers and preamble)
uint32_t Top; // Bits in x<<64 positions uint32_t Top; // Bits in x<<64 positions
uint32_t Mid; // Bits in x<<32 positions uint32_t Mid; // Bits in x<<32 positions
uint32_t Bot; // Lowest ordinal positions uint32_t Bot; // Lowest ordinal positions
} wiegand_message_t; } wiegand_message_t;
// Structure for unpacked wiegand card, like HID prox // Structure for unpacked wiegand card, like HID prox
typedef struct { typedef struct {
uint32_t FacilityCode; uint32_t FacilityCode;
uint64_t CardNumber; uint64_t CardNumber;
uint32_t IssueLevel; uint32_t IssueLevel;
uint32_t OEM; uint32_t OEM;
bool ParityValid; // Only valid for responses bool ParityValid; // Only valid for responses
} wiegand_card_t; } wiegand_card_t;
bool get_bit_by_position(wiegand_message_t* data, uint8_t pos); bool get_bit_by_position(wiegand_message_t *data, uint8_t pos);
bool set_bit_by_position(wiegand_message_t* data, bool value, uint8_t pos); bool set_bit_by_position(wiegand_message_t *data, bool value, uint8_t pos);
uint64_t get_linear_field(wiegand_message_t* data, uint8_t firstBit, uint8_t length); uint64_t get_linear_field(wiegand_message_t *data, uint8_t firstBit, uint8_t length);
bool set_linear_field(wiegand_message_t* data, uint64_t value, uint8_t firstBit, uint8_t length); bool set_linear_field(wiegand_message_t *data, uint64_t value, uint8_t firstBit, uint8_t length);
uint64_t get_nonlinear_field(wiegand_message_t* data, uint8_t numBits, uint8_t* bits); uint64_t get_nonlinear_field(wiegand_message_t *data, uint8_t numBits, uint8_t *bits);
bool set_nonlinear_field(wiegand_message_t* data, uint64_t value, uint8_t numBits, uint8_t* bits); bool set_nonlinear_field(wiegand_message_t *data, uint64_t value, uint8_t numBits, uint8_t *bits);
wiegand_message_t initialize_message_object(uint32_t top, uint32_t mid, uint32_t bot); wiegand_message_t initialize_message_object(uint32_t top, uint32_t mid, uint32_t bot);
bool add_HID_header(wiegand_message_t* data); bool add_HID_header(wiegand_message_t *data);
#endif #endif