git.zerfleddert.de Git - proxmark3-svn/blobdiff

index d7c824d9c85505599b08067265a6723605996187..3b299c9a9854348678606402f23ccba707711216 100644 (file)

--- a/client/util.c

+++ b/client/util.c

@@ -16,6 +16,7 @@

#include <stdlib.h>

#include <stdio.h>

#include <time.h>

#include <stdlib.h>

#include <stdio.h>

#include <time.h>

+#include <stdarg.h>

#ifdef _WIN32

#include <windows.h>

#ifdef _WIN32

#include <windows.h>

@@ -25,7 +26,7 @@

#ifndef _WIN32

#include <termios.h>

#ifndef _WIN32

#include <termios.h>

-#include <sys/ioctl.h>

+#include <sys/ioctl.h>

#include <unistd.h>

int ukbhit(void)

#include <unistd.h>

int ukbhit(void)

@@ -41,17 +42,32 @@ int ukbhit(void)

Ntty.c_oflag = 0x0000; // output mode

Ntty.c_lflag &= ~ICANON; // control mode = raw

Ntty.c_cc[VMIN] = 1; // return if at least 1 character is in the queue

Ntty.c_oflag = 0x0000; // output mode

Ntty.c_lflag &= ~ICANON; // control mode = raw

Ntty.c_cc[VMIN] = 1; // return if at least 1 character is in the queue

- Ntty.c_cc[VTIME] = 0; // no timeout. Wait forever

+ Ntty.c_cc[VTIME] = 0; // no timeout. Wait forever

if (0 == (error = tcsetattr(STDIN_FILENO, TCSANOW, &Ntty))) { // set new attributes

- error += ioctl(STDIN_FILENO, FIONREAD, &cnt); // get number of characters availabe

- error += tcsetattr(STDIN_FILENO, TCSANOW, &Otty); // reset attributes

+ error += ioctl(STDIN_FILENO, FIONREAD, &cnt); // get number of characters availabe

+ error += tcsetattr(STDIN_FILENO, TCSANOW, &Otty); // reset attributes

}

return ( error == 0 ? cnt : -1 );

}

return ( error == 0 ? cnt : -1 );

}

-#else

+char getch(void)

+ char c;

+ int error;

+ struct termios Otty, Ntty;

+ if ( tcgetattr(STDIN_FILENO, &Otty) == -1 ) return -1;

+ Ntty = Otty;

+ Ntty.c_lflag &= ~ICANON; /* disable buffered i/o */

+ if (0 == (error = tcsetattr(STDIN_FILENO, TCSANOW, &Ntty))) { // set new attributes

+ c = getchar();

+ error += tcsetattr(STDIN_FILENO, TCSANOW, &Otty); // reset attributes

+ }

+ return ( error == 0 ? c : -1 );

+#else // _WIN32

#include <conio.h>

int ukbhit(void) {

#include <conio.h>

int ukbhit(void) {

@@ -62,13 +78,13 @@ int ukbhit(void) {

// log files functions

void AddLogLine(char *file, char *extData, char *c) {

FILE *fLog = NULL;

// log files functions

void AddLogLine(char *file, char *extData, char *c) {

FILE *fLog = NULL;

- char filename[FILE_PATH_SIZE] = {0x00};

- int len = 0;

+ char filename[FILE_PATH_SIZE] = {0x00};

+ int len = 0;

+ len = strlen(file);

+ if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;

+ memcpy(filename, file, len);

- len = strlen(file);

- if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;

- memcpy(filename, file, len);

fLog = fopen(filename, "a");

if (!fLog) {

printf("Could not append log file %s", filename);

fLog = fopen(filename, "a");

if (!fLog) {

printf("Could not append log file %s", filename);

@@ -101,36 +117,74 @@ void AddLogCurrentDT(char *fileName) {

AddLogLine(fileName, "\nanticollision: ", buff);

}

AddLogLine(fileName, "\nanticollision: ", buff);

}

-void FillFileNameByUID(char *fileName, uint8_t * uid, char *ext, int byteCount) {

+void FillFileNameByUID(char *fileName, uint8_t *uid, char *ext, int byteCount) {

char * fnameptr = fileName;

- memset(fileName, 0x00, 200);

for (int j = 0; j < byteCount; j++, fnameptr += 2)

- sprintf(fnameptr, "%02x", (unsigned int) uid[j]);

- sprintf(fnameptr, "%s", ext);

+ sprintf(fnameptr, "%02x", (unsigned int) uid[j]);

+ sprintf(fnameptr, "%s", ext);

+// fill buffer from structure [{uint8_t data, size_t length},...]

+int FillBuffer(uint8_t *data, size_t maxDataLength, size_t *dataLength, ...) {

+ *dataLength = 0;

+ va_list valist;

+ va_start(valist, dataLength);

+ uint8_t *vdata = NULL;

+ size_t vlength = 0;

+ do{

+ vdata = va_arg(valist, uint8_t *);

+ if (!vdata)

+ break;

+ vlength = va_arg(valist, size_t);

+ if (*dataLength + vlength > maxDataLength) {

+ va_end(valist);

+ return 1;

+ }

+ memcpy(&data[*dataLength], vdata, vlength);

+ *dataLength += vlength;

+ } while (vdata);

+ va_end(valist);

+ return 0;

+bool CheckStringIsHEXValue(const char *value) {

+ for (int i = 0; i < strlen(value); i++)

+ if (!isxdigit(value[i]))

+ return false;

+ if (strlen(value) % 2)

+ return false;

+ return true;

}

-void hex_to_buffer(const uint8_t *buf, const uint8_t *hex_data, const size_t hex_len, const size_t hex_max_len,

+void hex_to_buffer(const uint8_t *buf, const uint8_t *hex_data, const size_t hex_len, const size_t hex_max_len,

const size_t min_str_len, const size_t spaces_between, bool uppercase) {

char *tmp = (char *)buf;

- size_t i;

- memset(tmp, 0x00, hex_max_len);

- int maxLen = ( hex_len > hex_max_len) ? hex_max_len : hex_len;

+ int maxLen = (hex_len > hex_max_len) ? hex_max_len : hex_len;

- for (i = 0; i < maxLen; ++i, tmp += 2 + spaces_between) {

- sprintf(tmp, (uppercase) ? "%02X" : "%02x", (unsigned int) hex_data[i]);

- for (int j = 0; j < spaces_between; j++)

- sprintf(tmp + 2 + j, " ");

+ for (int i = 0; i < maxLen; ++i, tmp += 2 + spaces_between) {

+ sprintf(tmp, (uppercase) ? "%02X" : "%02x", (unsigned int) hex_data[i]);

+ if (i != maxLen - 1)

+ for (int j = 0; j < spaces_between; j++)

+ sprintf(tmp + 2 + j, " ");

}

- i *= (2 + spaces_between);

- int minStrLen = min_str_len > i ? min_str_len : 0;

+ size_t len = strlen(tmp);

+ int minStrLen = min_str_len > len ? min_str_len : 0;

if (minStrLen > hex_max_len)

minStrLen = hex_max_len;

if (minStrLen > hex_max_len)

minStrLen = hex_max_len;

- for(; i < minStrLen; i++, tmp += 1)

+ for (int i = len; i < minStrLen; i++, tmp += 1)

sprintf(tmp, " ");

return;

sprintf(tmp, " ");

return;

@@ -139,15 +193,15 @@ void hex_to_buffer(const uint8_t *buf, const uint8_t *hex_data, const size_t hex

// printing and converting functions

char *sprint_hex(const uint8_t *data, const size_t len) {

// printing and converting functions

char *sprint_hex(const uint8_t *data, const size_t len) {

- static char buf[1025] = {0};

+ static char buf[4097] = {0};

hex_to_buffer((uint8_t *)buf, data, len, sizeof(buf) - 1, 0, 1, false);

return buf;

}

char *sprint_hex_inrow_ex(const uint8_t *data, const size_t len, const size_t min_str_len) {

hex_to_buffer((uint8_t *)buf, data, len, sizeof(buf) - 1, 0, 1, false);

return buf;

}

char *sprint_hex_inrow_ex(const uint8_t *data, const size_t len, const size_t min_str_len) {

- static char buf[1025] = {0};

+ static char buf[4097] = {0};

hex_to_buffer((uint8_t *)buf, data, len, sizeof(buf) - 1, min_str_len, 0, false);

@@ -204,14 +258,18 @@ char *sprint_ascii_ex(const uint8_t *data, const size_t len, const size_t min_st

tmp[i] = ((c < 32) || (c == 127)) ? '.' : c;

++i;

}

tmp[i] = ((c < 32) || (c == 127)) ? '.' : c;

++i;

}

int minStrLen = min_str_len > i ? min_str_len : 0;

- for(; i < minStrLen; ++i)

+ for(; i < minStrLen; ++i)

tmp[i] = ' ';

return buf;

}

return buf;

}

+char *sprint_ascii(const uint8_t *data, const size_t len) {

+ return sprint_ascii_ex(data, len, 0);

void num_to_bytes(uint64_t n, size_t len, uint8_t* dest)

{

while (len--) {

void num_to_bytes(uint64_t n, size_t len, uint8_t* dest)

{

while (len--) {

@@ -231,7 +289,7 @@ uint64_t bytes_to_num(uint8_t* src, size_t len)

return num;

}

return num;

}

-void num_to_bytebits(uint64_t n, size_t len, uint8_t *dest) {

+void num_to_bytebits(uint64_t n, size_t len, uint8_t *dest) {

while (len--) {

dest[len] = n & 1;

n >>= 1;

while (len--) {

dest[len] = n & 1;

n >>= 1;

@@ -263,38 +321,37 @@ uint32_t SwapBits(uint32_t value, int nrbits) {

uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockSize){

static uint8_t buf[64];

memset(buf, 0x00, 64);

uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockSize){

static uint8_t buf[64];

memset(buf, 0x00, 64);

- uint8_t *tmp = buf;

for (uint8_t block=0; block < (uint8_t)(len/blockSize); block++){

for (size_t i = 0; i < blockSize; i++){

for (uint8_t block=0; block < (uint8_t)(len/blockSize); block++){

for (size_t i = 0; i < blockSize; i++){

- tmp[i+(blockSize*block)] = src[(blockSize-1-i)+(blockSize*block)];

+ buf[i+(blockSize*block)] = src[(blockSize-1-i)+(blockSize*block)];

}

- return tmp;

+ return buf;

}

//assumes little endian

}

//assumes little endian

-char * printBits(size_t const size, void const * const ptr)

+char *printBits(size_t const size, void const * const ptr)

{

- unsigned char *b = (unsigned char*) ptr;

- unsigned char byte;

+ unsigned char *b = (unsigned char*) ptr;

+ unsigned char byte;

static char buf[1024];

- char * tmp = buf;

- int i, j;

- for (i=size-1;i>=0;i--)

- {

- for (j=7;j>=0;j--)

- {

- byte = b[i] & (1<<j);

- byte >>= j;

- sprintf(tmp, "%u", (unsigned int)byte);

+ char *tmp = buf;

+ int i, j;

+ for (i=size-1;i>=0;i--)

+ {

+ for (j=7;j>=0;j--)

+ {

+ byte = b[i] & (1<<j);

+ byte >>= j;

+ sprintf(tmp, "%u", (unsigned int)byte);

tmp++;

- }

+ }

return buf;

}

return buf;

}

-char * printBitsPar(const uint8_t *b, size_t len) {

+char *printBitsPar(const uint8_t *b, size_t len) {

static char buf1[512] = {0};

static char buf2[512] = {0};

static char *buf;

static char buf1[512] = {0};

static char buf2[512] = {0};

static char *buf;

@@ -324,10 +381,10 @@ int param_getptr(const char *line, int *bg, int *en, int paramnum)

{

int i;

int len = strlen(line);

{

int i;

int len = strlen(line);

*bg = 0;

*en = 0;

*bg = 0;

*en = 0;

// skip spaces

while (line[*bg] ==' ' || line[*bg]=='\t') (*bg)++;

if (*bg >= len) {

// skip spaces

while (line[*bg] ==' ' || line[*bg]=='\t') (*bg)++;

if (*bg >= len) {

@@ -337,13 +394,13 @@ int param_getptr(const char *line, int *bg, int *en, int paramnum)

for (i = 0; i < paramnum; i++) {

while (line[*bg]!=' ' && line[*bg]!='\t' && line[*bg] != '\0') (*bg)++;

while (line[*bg]==' ' || line[*bg]=='\t') (*bg)++;

for (i = 0; i < paramnum; i++) {

while (line[*bg]!=' ' && line[*bg]!='\t' && line[*bg] != '\0') (*bg)++;

while (line[*bg]==' ' || line[*bg]=='\t') (*bg)++;

if (line[*bg] == '\0') return 1;

}

if (line[*bg] == '\0') return 1;

}

*en = *bg;

while (line[*en] != ' ' && line[*en] != '\t' && line[*en] != '\0') (*en)++;

*en = *bg;

while (line[*en] != ' ' && line[*en] != '\t' && line[*en] != '\0') (*en)++;

(*en)--;

return 0;

(*en)--;

return 0;

@@ -353,7 +410,7 @@ int param_getptr(const char *line, int *bg, int *en, int paramnum)

int param_getlength(const char *line, int paramnum)

{

int bg, en;

int param_getlength(const char *line, int paramnum)

{

int bg, en;

if (param_getptr(line, &bg, &en, paramnum)) return 0;

return en - bg + 1;

if (param_getptr(line, &bg, &en, paramnum)) return 0;

return en - bg + 1;

@@ -365,12 +422,12 @@ char param_getchar(const char *line, int paramnum) {

char param_getchar_indx(const char *line, int indx, int paramnum) {

int bg, en;

char param_getchar_indx(const char *line, int indx, int paramnum) {

int bg, en;

if (param_getptr(line, &bg, &en, paramnum)) return 0x00;

if (bg + indx > en)

return '\0';

if (param_getptr(line, &bg, &en, paramnum)) return 0x00;

if (bg + indx > en)

return '\0';

return line[bg + indx];

}

return line[bg + indx];

}

@@ -403,7 +460,7 @@ uint8_t param_isdec(const char *line, int paramnum)

int bg, en;

//TODO, check more thorougly

if (!param_getptr(line, &bg, &en, paramnum)) return 1;

int bg, en;

//TODO, check more thorougly

if (!param_getptr(line, &bg, &en, paramnum)) return 1;

- // return strtoul(&line[bg], NULL, 10) & 0xff;

+ // return strtoul(&line[bg], NULL, 10) & 0xff;

return 0;

}

return 0;

}

@@ -412,7 +469,7 @@ uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base)

{

int bg, en;

{

int bg, en;

- if (!param_getptr(line, &bg, &en, paramnum))

+ if (!param_getptr(line, &bg, &en, paramnum))

return strtoul(&line[bg], NULL, base) & 0xff;

else

return deflt;

return strtoul(&line[bg], NULL, base) & 0xff;

else

return deflt;

@@ -422,7 +479,7 @@ uint32_t param_get32ex(const char *line, int paramnum, int deflt, int base)

{

int bg, en;

{

int bg, en;

- if (!param_getptr(line, &bg, &en, paramnum))

+ if (!param_getptr(line, &bg, &en, paramnum))

return strtoul(&line[bg], NULL, base);

else

return deflt;

return strtoul(&line[bg], NULL, base);

else

return deflt;

@@ -432,52 +489,55 @@ uint64_t param_get64ex(const char *line, int paramnum, int deflt, int base)

{

int bg, en;

{

int bg, en;

- if (!param_getptr(line, &bg, &en, paramnum))

+ if (!param_getptr(line, &bg, &en, paramnum))

return strtoull(&line[bg], NULL, base);

else

return deflt;

}

return strtoull(&line[bg], NULL, base);

else

return deflt;

}

-int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt)

+int param_gethex(const char *line, int paramnum, uint8_t *data, int hexcnt)

{

int bg, en, temp, i;

if (hexcnt % 2)

return 1;

{

int bg, en, temp, i;

if (hexcnt % 2)

return 1;

if (param_getptr(line, &bg, &en, paramnum)) return 1;

- if (en - bg + 1 != hexcnt)

+ if (en - bg + 1 != hexcnt)

return 1;

for(i = 0; i < hexcnt; i += 2) {

return 1;

for(i = 0; i < hexcnt; i += 2) {

- if (!(isxdigit((unsigned char)line[bg + i]) && isxdigit((unsigned char)line[bg + i + 1])) ) return 1;

+ if (!(isxdigit((unsigned char)line[bg + i]) && isxdigit((unsigned char)line[bg + i + 1])) ) return 1;

sscanf((char[]){line[bg + i], line[bg + i + 1], 0}, "%X", &temp);

data[i / 2] = temp & 0xff;

sscanf((char[]){line[bg + i], line[bg + i + 1], 0}, "%X", &temp);

data[i / 2] = temp & 0xff;

- }

+ }

return 0;

}

return 0;

}

-int param_gethex_ex(const char *line, int paramnum, uint8_t * data, int *hexcnt)

+int param_gethex_ex(const char *line, int paramnum, uint8_t *data, int *hexcnt)

{

int bg, en, temp, i;

//if (hexcnt % 2)

{

int bg, en, temp, i;

//if (hexcnt % 2)

- // return 1;

+ // return 1;

if (param_getptr(line, &bg, &en, paramnum)) return 1;

+ if (en - bg + 1 > *hexcnt) return 1;

*hexcnt = en - bg + 1;

if (*hexcnt % 2) //error if not complete hex bytes

return 1;

for(i = 0; i < *hexcnt; i += 2) {

*hexcnt = en - bg + 1;

if (*hexcnt % 2) //error if not complete hex bytes

return 1;

for(i = 0; i < *hexcnt; i += 2) {

- if (!(isxdigit((unsigned char)line[bg + i]) && isxdigit((unsigned char)line[bg + i + 1])) ) return 1;

+ if (!(isxdigit((unsigned char)line[bg + i]) && isxdigit((unsigned char)line[bg + i + 1])) ) return 1;

sscanf((char[]){line[bg + i], line[bg + i + 1], 0}, "%X", &temp);

data[i / 2] = temp & 0xff;

sscanf((char[]){line[bg + i], line[bg + i + 1], 0}, "%X", &temp);

data[i / 2] = temp & 0xff;

- }

+ }

return 0;

}

return 0;

}

@@ -490,21 +550,21 @@ int param_gethex_to_eol(const char *line, int paramnum, uint8_t * data, int maxd

if (param_getptr(line, &bg, &en, paramnum)) return 1;

*datalen = 0;

if (param_getptr(line, &bg, &en, paramnum)) return 1;

*datalen = 0;

int indx = bg;

while (line[indx]) {

if (line[indx] == '\t' || line[indx] == ' ') {

indx++;

continue;

}

int indx = bg;

while (line[indx]) {

if (line[indx] == '\t' || line[indx] == ' ') {

indx++;

continue;

}

if (isxdigit((unsigned char)line[indx])) {

buf[strlen(buf) + 1] = 0x00;

buf[strlen(buf)] = line[indx];

} else {

// if we have symbols other than spaces and hex

return 1;

if (isxdigit((unsigned char)line[indx])) {

buf[strlen(buf) + 1] = 0x00;

buf[strlen(buf)] = line[indx];

} else {

// if we have symbols other than spaces and hex

return 1;

- }

+ }

if (*datalen >= maxdatalen) {

// if we dont have space in buffer and have symbols to translate

if (*datalen >= maxdatalen) {

// if we dont have space in buffer and have symbols to translate

@@ -517,14 +577,14 @@ int param_gethex_to_eol(const char *line, int paramnum, uint8_t * data, int maxd

*buf = 0;

(*datalen)++;

}

*buf = 0;

(*datalen)++;

}

indx++;

}

indx++;

}

- if (strlen(buf) > 0)

+ if (strlen(buf) > 0)

//error when not completed hex bytes

return 3;

//error when not completed hex bytes

return 3;

return 0;

}

return 0;

}

@@ -532,7 +592,7 @@ int param_getstr(const char *line, int paramnum, char * str, size_t buffersize)

{

int bg, en;

{

int bg, en;

- if (param_getptr(line, &bg, &en, paramnum)) {

+ if (param_getptr(line, &bg, &en, paramnum)) {

return 0;

}

return 0;

}

@@ -541,10 +601,10 @@ int param_getstr(const char *line, int paramnum, char * str, size_t buffersize)

printf("out of bounds error: want %d bytes have %zd bytes\n", en - bg + 1 + 1, buffersize);

return 0;

}

printf("out of bounds error: want %d bytes have %zd bytes\n", en - bg + 1 + 1, buffersize);

return 0;

}

memcpy(str, line + bg, en - bg + 1);

str[en - bg + 1] = 0;

memcpy(str, line + bg, en - bg + 1);

str[en - bg + 1] = 0;

return en - bg + 1;

}

return en - bg + 1;

}

@@ -557,100 +617,100 @@ https://github.com/ApertureLabsLtd/RFIDler/blob/master/firmware/Pic32/RFIDler.X/

// returns number of bits converted

int hextobinarray(char *target, char *source)

{

// returns number of bits converted

int hextobinarray(char *target, char *source)

{

- int length, i, count= 0;

- char* start = source;

- char x;

- length = strlen(source);

- // process 4 bits (1 hex digit) at a time

- while(length--)

- {

- x= *(source++);

- // capitalize

- if (x >= 'a' && x <= 'f')

- x -= 32;

- // convert to numeric value

- if (x >= '0' && x <= '9')

- x -= '0';

- else if (x >= 'A' && x <= 'F')

- x -= 'A' - 10;

- else {

- printf("Discovered unknown character %c %d at idx %tu of %s\n", x, x, source - start, start);

- return 0;

- }

- // output

- for(i= 0 ; i < 4 ; ++i, ++count)

- *(target++)= (x >> (3 - i)) & 1;

- }

- return count;

+ int length, i, count= 0;

+ char* start = source;

+ char x;

+ length = strlen(source);

+ // process 4 bits (1 hex digit) at a time

+ while(length--)

+ {

+ x= *(source++);

+ // capitalize

+ if (x >= 'a' && x <= 'f')

+ x -= 32;

+ // convert to numeric value

+ if (x >= '0' && x <= '9')

+ x -= '0';

+ else if (x >= 'A' && x <= 'F')

+ x -= 'A' - 10;

+ else {

+ printf("Discovered unknown character %c %d at idx %tu of %s\n", x, x, source - start, start);

+ return 0;

+ }

+ // output

+ for(i= 0 ; i < 4 ; ++i, ++count)

+ *(target++)= (x >> (3 - i)) & 1;

+ }

+ return count;

}

// convert binary array of 0x00/0x01 values to hex (safe to do in place as target will always be shorter than source)

// return number of bits converted

int binarraytohex(char *target,char *source, int length)

{

}

// convert binary array of 0x00/0x01 values to hex (safe to do in place as target will always be shorter than source)

// return number of bits converted

int binarraytohex(char *target,char *source, int length)

{

- unsigned char i, x;

- int j = length;

+ unsigned char i, x;

+ int j = length;

- if(j % 4)

- return 0;

+ if(j % 4)

+ return 0;

- while(j)

- {

- for(i= x= 0 ; i < 4 ; ++i)

- x += ( source[i] << (3 - i));

- sprintf(target,"%X", (unsigned int)x);

- ++target;

- source += 4;

- j -= 4;

- }

- return length;

+ while(j)

+ {

+ for(i= x= 0 ; i < 4 ; ++i)

+ x += ( source[i] << (3 - i));

+ sprintf(target,"%X", (unsigned int)x);

+ ++target;

+ source += 4;

+ j -= 4;

+ }

+ return length;

}

// return parity bit required to match type

uint8_t GetParity( uint8_t *bits, uint8_t type, int length)

{

}

// return parity bit required to match type

uint8_t GetParity( uint8_t *bits, uint8_t type, int length)

{

- int x;

+ int x;

- for(x= 0 ; length > 0 ; --length)

- x += bits[length - 1];

- x %= 2;

+ for(x= 0 ; length > 0 ; --length)

+ x += bits[length - 1];

+ x %= 2;

- return x ^ type;

+ return x ^ type;

}

// add HID parity to binary array: EVEN prefix for 1st half of ID, ODD suffix for 2nd half

void wiegand_add_parity(uint8_t *target, uint8_t *source, uint8_t length)

{

}

// add HID parity to binary array: EVEN prefix for 1st half of ID, ODD suffix for 2nd half

void wiegand_add_parity(uint8_t *target, uint8_t *source, uint8_t length)

{

- *(target++)= GetParity(source, EVEN, length / 2);

- memcpy(target, source, length);

- target += length;

- *(target)= GetParity(source + length / 2, ODD, length / 2);

+ *(target++)= GetParity(source, EVEN, length / 2);

+ memcpy(target, source, length);

+ target += length;

+ *(target)= GetParity(source + length / 2, ODD, length / 2);

}

// xor two arrays together for len items. The dst array contains the new xored values.

void xor(unsigned char *dst, unsigned char *src, size_t len) {

for( ; len > 0; len--,dst++,src++)

}

// xor two arrays together for len items. The dst array contains the new xored values.

void xor(unsigned char *dst, unsigned char *src, size_t len) {

for( ; len > 0; len--,dst++,src++)

- *dst ^= *src;

+ *dst ^= *src;

}

// RotateLeft - Ultralight, Desfire, works on byte level

// 00-01-02 >> 01-02-00

void rol(uint8_t *data, const size_t len){

}

// RotateLeft - Ultralight, Desfire, works on byte level

// 00-01-02 >> 01-02-00

void rol(uint8_t *data, const size_t len){

- uint8_t first = data[0];

- for (size_t i = 0; i < len-1; i++) {

- data[i] = data[i+1];

- }

- data[len-1] = first;

+ uint8_t first = data[0];

+ for (size_t i = 0; i < len-1; i++) {

+ data[i] = data[i+1];

+ }

+ data[len-1] = first;

}

// Replace unprintable characters with a dot in char buffer

void clean_ascii(unsigned char *buf, size_t len) {

for (size_t i = 0; i < len; i++) {

}

// Replace unprintable characters with a dot in char buffer

void clean_ascii(unsigned char *buf, size_t len) {

for (size_t i = 0; i < len; i++) {

- if (!isprint(buf[i]))

- buf[i] = '.';

+ if (!isprint(buf[i]))

+ buf[i] = '.';

}

@@ -663,8 +723,8 @@ void strcleanrn(char *buf, size_t len) {

// replace char in buffer

void strcreplace(char *buf, size_t len, char from, char to) {

for (size_t i = 0; i < len; i++) {

// replace char in buffer

void strcreplace(char *buf, size_t len, char from, char to) {

for (size_t i = 0; i < len; i++) {

- if (buf[i] == from)

- buf[i] = to;

+ if (buf[i] == from)

+ buf[i] = to;

}

@@ -673,7 +733,7 @@ char *strmcopy(char *buf) {

if ((str = (char*) malloc(strlen(buf) + 1)) != NULL) {

memset(str, 0, strlen(buf) + 1);

strcpy(str, buf);

if ((str = (char*) malloc(strlen(buf) + 1)) != NULL) {

memset(str, 0, strlen(buf) + 1);

strcpy(str, buf);

- }

+ }

return str;

}

return str;

}