Revert "Traces"

[proxmark3-svn] / client / util.c

diff --git a/client/util.c b/client/util.c
index 8a62e361aec8f9ba8452c12887627d13eabe70b5..b8d5c316cf9bce03cfd4faab842d4ad1e0185423 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -10,9 +10,10 @@
 
 #include "util.h"
 
 
 #include "util.h"
 

-#ifndef WIN32
+#ifndef _WIN32

 #include <termios.h>
 #include <sys/ioctl.h> 
 #include <termios.h>
 #include <sys/ioctl.h> 

+

 int ukbhit(void)
 {
   int cnt = 0;
 int ukbhit(void)
 {
   int cnt = 0;


@@ -45,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;
        }
 


@@ -80,15 +87,13 @@ void AddLogCurrentDT(char *fileName) {
        AddLogLine(fileName, "\nanticollision: ", buff);
 }
 
        AddLogLine(fileName, "\nanticollision: ", buff);
 }
 

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

        char * fnameptr = fileName;
        memset(fileName, 0x00, 200);
        
        char * fnameptr = fileName;
        memset(fileName, 0x00, 200);
        

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

                sprintf(fnameptr, "%02x", uid[j]); 
        sprintf(fnameptr, "%s", ext); 
                sprintf(fnameptr, "%02x", uid[j]); 
        sprintf(fnameptr, "%s", ext); 

-       
-       printf("fname:%s", fileName);

 }
 
 // printing and converting functions
 }
 
 // printing and converting functions


@@ -104,16 +109,31 @@ void print_hex(const uint8_t * data, const size_t len)
 }
 
 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];
        char * tmp = buf;
        size_t i;
 
        static char buf[1024];
        char * tmp = buf;
        size_t i;
 

-       for (i=0; i < len && i < 1024/3; i++, tmp += 3)
+       for (i=0; i < maxLen; ++i, tmp += 3)

                sprintf(tmp, "%02x ", data[i]);
 
        return buf;
 }
 
                sprintf(tmp, "%02x ", data[i]);
 
        return buf;
 }
 

+char * sprint_bin(const uint8_t * data, const size_t len) {
+       
+       int maxLen = ( len > 1024) ? 1024 : len;
+       static char buf[1024];
+       char * tmp = buf;
+       size_t i;
+
+       for (i=0; i < maxLen; ++i, ++tmp)
+               sprintf(tmp, "%u", data[i]);
+
+       return buf;
+}
+

 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--) {


@@ -133,6 +153,28 @@ uint64_t bytes_to_num(uint8_t* src, size_t len)
        return num;
 }
 
        return num;
 }
 

+//assumes little endian
+char * printBits(size_t const size, void const * const ptr)
+{
+    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", byte);
+                       tmp++;
+        }
+    }
+       return buf;
+}
+

 //  -------------------------------------------------------------------------
 //  string parameters lib
 //  -------------------------------------------------------------------------
 //  -------------------------------------------------------------------------
 //  string parameters lib
 //  -------------------------------------------------------------------------


@@ -190,7 +232,7 @@ uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base)
        int bg, en;
 
        if (!param_getptr(line, &bg, &en, paramnum)) 
        int bg, en;
 
        if (!param_getptr(line, &bg, &en, paramnum)) 

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

        else
                return deflt;
 }
        else
                return deflt;
 }


@@ -200,7 +242,7 @@ uint32_t param_get32ex(const char *line, int paramnum, int deflt, int base)
        int bg, en;
 
        if (!param_getptr(line, &bg, &en, paramnum)) 
        int bg, en;
 
        if (!param_getptr(line, &bg, &en, paramnum)) 

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

        else
                return deflt;
 }
        else
                return deflt;
 }


@@ -210,7 +252,7 @@ uint64_t param_get64ex(const char *line, int paramnum, int deflt, int base)
        int bg, en;
 
        if (!param_getptr(line, &bg, &en, paramnum)) 
        int bg, en;
 
        if (!param_getptr(line, &bg, &en, paramnum)) 

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

        else
                return deflt;
 
        else
                return deflt;
 


@@ -250,3 +292,102 @@ 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);
+}