@marshmellows memory fix

[proxmark3-svn] / client / util.c

diff --git a/client/util.c b/client/util.c
index 1ebfebea2ce452870ebccfaecaf95faeb6bc31ad..797a93927e16ae57a6598ee905840bcfc3962ca8 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -46,12 +46,18 @@ int ukbhit(void) {
 #endif
 
 // log files functions
 #endif
 
 // log files functions

-void AddLogLine(char *fileName, char *extData, char *c) {
+void AddLogLine(char *file, char *extData, char *c) {

        FILE *fLog = NULL;
        FILE *fLog = NULL;

-
-       fLog = fopen(fileName, "a");
+    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);
+   
+       fLog = fopen(filename, "a");

        if (!fLog) {
        if (!fLog) {

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

                return;
        }
 
                return;
        }
 


@@ -102,28 +108,39 @@ void print_hex(const uint8_t * data, const size_t len)
        printf("\n");
 }
 
        printf("\n");
 }
 

-char * sprint_hex(const uint8_t * data, const size_t len) {
+char *sprint_hex(const uint8_t *data, const size_t len) {
+       
+       int maxLen = ( len > 1024/3) ? 1024/3 : len;

        static char buf[1024];
        static char buf[1024];

+       memset(buf, 0x00, 1024);

        char * tmp = buf;
        size_t i;
 
        char * tmp = buf;
        size_t i;
 

-       for (i=0; i < len && i < 1024/3; i++, tmp += 3)
-               sprintf(tmp, "%02x ", data[i]);
+       for (i=0; i < maxLen; ++i, tmp += 3)
+               sprintf(tmp, "%02X ", data[i]);

 
        return buf;
 }
 
 
        return buf;
 }
 

-char * sprint_bin(const uint8_t * data, const size_t len) {
+char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t breaks) {
+       
+       int maxLen = ( len > 1020) ? 1020 : len;

        static char buf[1024];
        static char buf[1024];

-       char * tmp = buf;
-       size_t i;
+       memset(buf, 0x00, 1024);
+       char *tmp = buf;

 
 

-       for (i=0; i < len && i < 1024; i++, tmp++)
-               sprintf(tmp, "%u", data[i]);
+       for (size_t i=0; i < maxLen; ++i){
+               sprintf(tmp++, "%u", data[i]);
+               if (breaks > 0 && !((i+1) % breaks))
+                       sprintf(tmp++, "%s","\n");
+       }

 
        return buf;
 }
 
 
        return buf;
 }
 

+char *sprint_bin(const uint8_t *data, const size_t len) {
+       return sprint_bin_break(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--) {


@@ -143,6 +160,22 @@ uint64_t bytes_to_num(uint8_t* src, size_t len)
        return num;
 }
 
        return num;
 }
 

+// aa,bb,cc,dd,ee,ff,gg,hh, ii,jj,kk,ll,mm,nn,oo,pp
+// to
+// hh,gg,ff,ee,dd,cc,bb,aa, pp,oo,nn,mm,ll,kk,jj,ii
+// up to 64 bytes or 512 bits
+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++){
+                       tmp[i+(blockSize*block)] = src[(blockSize-1-i)+(blockSize*block)];
+               }
+       }
+       return tmp;
+}
+

 //assumes little endian
 char * printBits(size_t const size, void const * const ptr)
 {
 //assumes little endian
 char * printBits(size_t const size, void const * const ptr)
 {


@@ -203,6 +236,7 @@ int param_getptr(const char *line, int *bg, int *en, int paramnum)
        return 0;
 }
 
        return 0;
 }
 

+

 char param_getchar(const char *line, int paramnum)
 {
        int bg, en;
 char param_getchar(const char *line, int paramnum)
 {
        int bg, en;


@@ -214,7 +248,36 @@ char param_getchar(const char *line, int paramnum)
 
 uint8_t param_get8(const char *line, int paramnum)
 {
 
 uint8_t param_get8(const char *line, int paramnum)
 {

-       return param_get8ex(line, paramnum, 10, 0);
+       return param_get8ex(line, paramnum, 0, 10);
+}
+
+/**
+ * @brief Reads a decimal integer (actually, 0-254, not 255)
+ * @param line
+ * @param paramnum
+ * @return -1 if error
+ */
+uint8_t param_getdec(const char *line, int paramnum, uint8_t *destination)
+{
+       uint8_t val =  param_get8ex(line, paramnum, 255, 10);
+       if( (int8_t) val == -1) return 1;
+       (*destination) = val;
+       return 0;
+}
+/**
+ * @brief Checks if param is decimal
+ * @param line
+ * @param paramnum
+ * @return
+ */
+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;
+               //              return strtoul(&line[bg], NULL, 10) & 0xff;
+
+       return 0;

 }
 
 uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base)
 }
 
 uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base)


@@ -282,3 +345,126 @@ int param_getstr(const char *line, int paramnum, char * str)
        
        return en - bg + 1;
 }
        
        return en - bg + 1;
 }

+
+/*
+The following methods comes from Rfidler sourcecode.
+https://github.com/ApertureLabsLtd/RFIDler/blob/master/firmware/Pic32/RFIDler.X/src/
+*/
+
+// convert hex to sequence of 0/1 bit values
+// returns number of bits converted
+int hextobinarray(char *target, char *source)
+{
+    int length, i, count= 0;
+    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
+            return 0;
+        // output
+        for(i= 0 ; i < 4 ; ++i, ++count)
+            *(target++)= (x >> (3 - i)) & 1;
+    }
+    
+    return count;
+}
+
+// convert hex to human readable binary string
+int hextobinstring(char *target, char *source)
+{
+    int length;
+
+    if(!(length= hextobinarray(target, source)))
+        return 0;
+    binarraytobinstring(target, target, length);
+    return 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;
+
+    if(j % 4)
+        return 0;
+
+    while(j)
+    {
+        for(i= x= 0 ; i < 4 ; ++i)
+            x +=  ( source[i] << (3 - i));
+        sprintf(target,"%X", x);
+        ++target;
+        source += 4;
+        j -= 4;
+    }
+    return length;
+}
+
+// convert binary array to human readable binary
+void binarraytobinstring(char *target, char *source,  int length)
+{
+    int i;
+
+    for(i= 0 ; i < length ; ++i)
+        *(target++)= *(source++) + '0';
+    *target= '\0';
+}
+
+// return parity bit required to match type
+uint8_t GetParity( char *bits, uint8_t type, int length)
+{
+    int x;
+
+    for(x= 0 ; length > 0 ; --length)
+        x += bits[length - 1];
+    x %= 2;
+
+    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(char *target, char *source, char length)
+{
+    *(target++)= GetParity(source, EVEN, length / 2);
+    memcpy(target, source, length);
+    target += length;
+    *(target)= GetParity(source + length / 2, ODD, length / 2);
+}
+
+void xor(unsigned char * dst, unsigned char * src, size_t len) {
+   for( ; len > 0; len--,dst++,src++)
+       *dst ^= *src;
+}
+
+int32_t le24toh (uint8_t data[3]) {
+    return (data[2] << 16) | (data[1] << 8) | data[0];
+}
+
+
+uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits) {
+       
+       int i = start;
+       int j = len-1;
+
+       if (len > 32) return 0;
+
+       uint32_t tmp = 0;
+       for (; j >= 0; --j, ++i)
+               tmp     |= bits[i] << j;
+
+       return tmp;
+}