CHG: this timing should be quite good. needs to be verified.

[proxmark3-svn] / client / util.c

diff --git a/client/util.c b/client/util.c
index 382c85c6a64362216c18b3f0dd73a88d5db1ea0c..b2ac82ae1d9522a58f0d2c6ef9e8a04459930aed 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -9,26 +9,25 @@
 //-----------------------------------------------------------------------------
 
 #include "util.h"
 //-----------------------------------------------------------------------------
 
 #include "util.h"

+#define MAX_BIN_BREAK_LENGTH   (3072+384+1)

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

-int ukbhit(void)
-{
+int ukbhit(void) {

   int cnt = 0;
   int error;
   static struct termios Otty, Ntty;
 
   int cnt = 0;
   int error;
   static struct termios Otty, Ntty;
 

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

   Ntty = Otty;
 
   Ntty = Otty;
 

-  Ntty.c_iflag          = 0;       /* input mode                */
-  Ntty.c_oflag          = 0;       /* output mode               */
-  Ntty.c_lflag         &= ~ICANON; /* raw mode */
-  Ntty.c_cc[VMIN]       = CMIN;    /* minimum time to wait      */
-  Ntty.c_cc[VTIME]      = CTIME;   /* minimum characters to wait for */
+  Ntty.c_iflag         = 0;       /* input mode                */
+  Ntty.c_oflag         = 0;       /* output mode               */
+  Ntty.c_lflag         &= ~ICANON; /* raw mode */
+  Ntty.c_cc[VMIN]      = CMIN;    /* minimum time to wait      */
+  Ntty.c_cc[VTIME]     = CTIME;   /* minimum characters to wait for */

 
   if (0 == (error = tcsetattr(0, TCSANOW, &Ntty))) {
     error += ioctl(0, FIONREAD, &cnt);
 
   if (0 == (error = tcsetattr(0, TCSANOW, &Ntty))) {
     error += ioctl(0, FIONREAD, &cnt);


@@ -47,7 +46,7 @@ int ukbhit(void) {
 
 // log files functions
 void AddLogLine(char *file, char *extData, char *c) {
 
 // log files functions
 void AddLogLine(char *file, char *extData, char *c) {

-       FILE *fLog = NULL;
+       FILE *f = NULL;

     char filename[FILE_PATH_SIZE] = {0x00};
     int len = 0;
 
     char filename[FILE_PATH_SIZE] = {0x00};
     int len = 0;
 


@@ -55,15 +54,16 @@ void AddLogLine(char *file, char *extData, char *c) {
     if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
     memcpy(filename, file, len);
    
     if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
     memcpy(filename, file, len);
    

-       fLog = fopen(filename, "a");
-       if (!fLog) {
+       f = fopen(filename, "a");
+       if (!f) {

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

-       fprintf(fLog, "%s", extData);
-       fprintf(fLog, "%s\n", c);
-       fclose(fLog);
+       fprintf(f, "%s", extData);
+       fprintf(f, "%s\n", c);
+       fflush(f);
+       fclose(f);

 }
 
 void AddLogHex(char *fileName, char *extData, const uint8_t * data, const size_t len){
 }
 
 void AddLogHex(char *fileName, char *extData, const uint8_t * data, const size_t len){


@@ -71,40 +71,58 @@ void AddLogHex(char *fileName, char *extData, const uint8_t * data, const size_t
 }
 
 void AddLogUint64(char *fileName, char *extData, const uint64_t data) {
 }
 
 void AddLogUint64(char *fileName, char *extData, const uint64_t data) {

-  char buf[100] = {0};
-       sprintf(buf, "%x%x", (unsigned int)((data & 0xFFFFFFFF00000000) >> 32), (unsigned int)(data & 0xFFFFFFFF));
+       char buf[20] = {0};
+       memset(buf, 0x00, sizeof(buf));
+       //sprintf(buf, "%X%X", (unsigned int)((data & 0xFFFFFFFF00000000) >> 32), (unsigned int)(data & 0xFFFFFFFF));
+       sprintf(buf, "%012"llx"", data);

        AddLogLine(fileName, extData, buf);
 }
 
 void AddLogCurrentDT(char *fileName) {
        AddLogLine(fileName, extData, buf);
 }
 
 void AddLogCurrentDT(char *fileName) {

-       char buff[20];
+       char buf[20];
+       memset(buf, 0x00, sizeof(buf));

        struct tm *curTime;
        struct tm *curTime;

-

        time_t now = time(0);
        curTime = gmtime(&now);
        time_t now = time(0);
        curTime = gmtime(&now);

-
-       strftime (buff, sizeof(buff), "%Y-%m-%d %H:%M:%S", curTime);
-       AddLogLine(fileName, "\nanticollision: ", buff);
+       strftime (buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", curTime);
+       AddLogLine(fileName, "\nanticollision: ", buf);

 }
 
 }
 

-void FillFileNameByUID(char *fileName, uint8_t * uid, char *ext, int byteCount) {
+void FillFileNameByUID(char *fileName, uint8_t *uid, char *ext, int byteCount) {
+       if ( fileName == NULL || uid == NULL || ext == NULL ){
+               printf("error: parameter is NULL\n");
+               return;
+       }

        char * fnameptr = fileName;
        char * fnameptr = fileName;

-       memset(fileName, 0x00, 200);
+       memset(fileName, 0x00, FILE_PATH_SIZE);

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

-               sprintf(fnameptr, "%02x", uid[j]); 
+               sprintf(fnameptr, "%02X", uid[j]); 

        sprintf(fnameptr, "%s", ext); 
 }
 
 // printing and converting functions
        sprintf(fnameptr, "%s", ext); 
 }
 
 // printing and converting functions

-
-void print_hex(const uint8_t * data, const size_t len)
-{
+void print_hex(const uint8_t * data, const size_t len) {

        size_t i;
        size_t i;

-
-       for (i=0; i < len; i++)
+       for (i=0; i < len; ++i)

                printf("%02x ", data[i]);
                printf("%02x ", data[i]);

+       printf("\n");
+}

 
 

+void print_hex_break(const uint8_t *data, const size_t len, uint8_t breaks) {
+
+       int rownum = 0;
+       printf("[%02d] | ", rownum);
+       for (int i = 0; i < len; ++i) {
+
+               printf("%02X ", data[i]);
+               
+               // check if a line break is needed
+               if ( breaks > 0 && !((i+1) % breaks) && (i+1 < len) ) {
+                       ++rownum;
+                       printf("\n[%02d] | ", rownum);
+               }
+       }

        printf("\n");
 }
 
        printf("\n");
 }
 


@@ -113,87 +131,115 @@ char *sprint_hex(const uint8_t *data, const size_t len) {
        int maxLen = ( len > 1024/3) ? 1024/3 : len;
        static char buf[1024];
        memset(buf, 0x00, 1024);
        int maxLen = ( len > 1024/3) ? 1024/3 : len;
        static char buf[1024];
        memset(buf, 0x00, 1024);

-       char *tmp = buf;
+       char * tmp = buf;

        size_t i;
 
        for (i=0; i < maxLen; ++i, tmp += 3)
                sprintf(tmp, "%02X ", data[i]);
        size_t i;
 
        for (i=0; i < maxLen; ++i, tmp += 3)
                sprintf(tmp, "%02X ", data[i]);

-

        return buf;
 }
 
 char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t breaks) {
        
        return buf;
 }
 
 char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t breaks) {
        

-       int maxLen = ( len > 1024) ? 1024 : len;
-       static char buf[1024];
-       memset(buf, 0x00, 1024);
+       // make sure we don't go beyond our char array memory
+       size_t in_index = 0, out_index = 0;
+       int max_len;    
+       if (breaks==0)
+               max_len = ( len > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len;
+       else
+               max_len = ( len+(len/breaks) > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len+(len/breaks);
+
+       static char buf[MAX_BIN_BREAK_LENGTH]; // 3072 + end of line characters if broken at 8 bits
+       //clear memory
+       memset(buf, 0x00, sizeof(buf));

        char *tmp = buf;
 
        char *tmp = buf;
 

-       for (size_t i=0; i < maxLen; ++i){
-               sprintf(tmp++, "%u", data[i]);
-               if (breaks > 0 && !((i+1) % breaks))
+       // loop through the out_index to make sure we don't go too far
+       for (out_index=0; out_index < max_len-2; out_index++) {
+               // set character
+               sprintf(tmp++, "%u", (unsigned int) data[in_index]);
+               // check if a line break is needed and we have room to print it in our array
+               if ( (breaks > 0) && !((in_index+1) % breaks) && (out_index+1 != max_len) ) {
+                       // increment and print line break
+                       out_index++;

                        sprintf(tmp++, "%s","\n");
                        sprintf(tmp++, "%s","\n");

+               }
+               in_index++;

        }
        }

-
+       // last char.
+       sprintf(tmp++, "%u", (unsigned int) data[in_index]);

        return buf;
 }
 
 char *sprint_bin(const uint8_t *data, const size_t len) {
        return sprint_bin_break(data, len, 0);
 }
        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)
-{
+
+char *sprint_hex_ascii(const uint8_t *data, const size_t len) {
+       static char buf[1024];
+       char *tmp = buf;
+       memset(buf, 0x00, 1024);
+       size_t max_len = (len > 1010) ? 1010 : len;
+       sprintf(tmp, "%s| %s", sprint_hex(data, max_len) , data);       
+       return buf;
+}
+
+void num_to_bytes(uint64_t n, size_t len, uint8_t* dest) {

        while (len--) {
                dest[len] = (uint8_t) n;
                n >>= 8;
        }
 }
 
        while (len--) {
                dest[len] = (uint8_t) n;
                n >>= 8;
        }
 }
 

-uint64_t bytes_to_num(uint8_t* src, size_t len)
-{
+uint64_t bytes_to_num(uint8_t* src, size_t len) {

        uint64_t num = 0;
        uint64_t num = 0;

-       while (len--)
-       {
+       while (len--) {

                num = (num << 8) | (*src);
                src++;
        }
        return num;
 }
 
                num = (num << 8) | (*src);
                src++;
        }
        return num;
 }
 

+// takes a number (uint64_t) and creates a binarray in dest.
+void num_to_bytebits(uint64_t n, size_t len, uint8_t *dest) {
+       while (len--) {
+               dest[len] = n & 1;
+               n >>= 1;
+       }
+}
+
+//least significant bit first
+void num_to_bytebitsLSBF(uint64_t n, size_t len, uint8_t *dest) {
+       for(int i = 0 ; i < len ; ++i) {
+               dest[i] =  n & 1;
+               n >>= 1;
+       }
+}
+

 // 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
 // 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(uint8_t *src, size_t len){
-       static uint8_t temp[64]={0};
-       for (uint8_t block=0; block < (uint8_t)len/8; block++){
-               for (size_t i = 0; i < 8; i++){
-                       temp[i+(8*block)] = src[(7-i)+(8*block)];
+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 temp;
+       return buf;

 }
 
 }
 

-//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;
+// takes a uint8_t src array, for len items and reverses the byte order in blocksizes (8,16,32,64), 
+// returns: the dest array contains the reordered src array.
+void SwapEndian64ex(const uint8_t *src, const size_t len, const uint8_t blockSize, uint8_t *dest){
+       for (uint8_t block=0; block < (uint8_t)(len/blockSize); block++){
+               for (size_t i = 0; i < blockSize; i++){
+                       dest[i+(blockSize*block)] = src[(blockSize-1-i)+(blockSize*block)];
+               }
+       }

 }
 
 //  -------------------------------------------------------------------------
 }
 
 //  -------------------------------------------------------------------------


@@ -246,7 +292,7 @@ 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);

 }
 
 /**
 }
 
 /**


@@ -306,21 +352,17 @@ uint64_t param_get64ex(const char *line, int paramnum, int deflt, int base)
                return strtoull(&line[bg], NULL, base);
        else
                return deflt;
                return strtoull(&line[bg], NULL, base);
        else
                return deflt;

-
-       return 0;

 }
 
 int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt)
 {
        int bg, en, temp, i;
 
 }
 
 int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt)
 {
        int bg, en, temp, i;
 

-       if (hexcnt % 2)
-               return 1;
+       if (hexcnt & 1) return 1;

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

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

 
        for(i = 0; i < hexcnt; i += 2) {
                if (!(isxdigit(line[bg + i]) && isxdigit(line[bg + i + 1])) )   return 1;
 
        for(i = 0; i < hexcnt; i += 2) {
                if (!(isxdigit(line[bg + i]) && isxdigit(line[bg + i + 1])) )   return 1;


@@ -331,7 +373,28 @@ int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt)
 
        return 0;
 }
 
        return 0;
 }

+int param_gethex_ex(const char *line, int paramnum, uint8_t * data, int *hexcnt)
+{
+       int bg, en, temp, i;

 
 

+       //if (hexcnt % 2)
+       //      return 1;
+       
+       if (param_getptr(line, &bg, &en, paramnum)) return 1;
+
+       *hexcnt = en - bg + 1;
+       if (*hexcnt % 2) //error if not complete hex bytes
+               return 1;
+
+       for(i = 0; i < *hexcnt; i += 2) {
+               if (!(isxdigit(line[bg + i]) && isxdigit(line[bg + i + 1])) ) return 1;
+               
+               sscanf((char[]){line[bg + i], line[bg + i + 1], 0}, "%X", &temp);
+               data[i / 2] = temp & 0xff;
+       }       
+
+       return 0;
+}

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


@@ -423,22 +486,92 @@ void binarraytobinstring(char *target, char *source,  int length)
 }
 
 // return parity bit required to match type
 }
 
 // return parity bit required to match type

-uint8_t GetParity( char *bits, uint8_t type, int length)
+uint8_t GetParity( uint8_t *bits, uint8_t type, int length)

 {
     int x;
 {
     int x;

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

         x += bits[length - 1];
     x %= 2;
         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
     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)
+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++)
+       *dst ^= *src;
+}
+
+int32_t le24toh (uint8_t data[3]) {
+    return (data[2] << 16) | (data[1] << 8) | data[0];
+}
+uint32_t le32toh (uint8_t *data) {
+       return (uint32_t)( (data[3]<<24) | (data[2]<<16) | (data[1]<<8) | data[0]);
+}
+// Pack a bitarray into a uint32_t.  
+uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits) {
+
+       if (len > 32) return 0;
+       
+       int i = start;
+       int j = len-1;
+       uint32_t tmp = 0;
+
+       for (; j >= 0; --j, ++i)
+               tmp     |= bits[i] << j;
+
+       return tmp;
+}
+
+// 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;
+}
+
+// Swap bit order on a uint32_t value.  Can be limited by nrbits just use say 8bits reversal
+// And clears the rest of the bits.
+uint32_t SwapBits(uint32_t value, int nrbits) {
+       uint32_t newvalue = 0;
+       for(int i = 0; i < nrbits; i++) {
+               newvalue ^= ((value >> i) & 1) << (nrbits - 1 - i);
+       }
+       return newvalue;
+}
+/*
+ ref  http://www.csm.ornl.gov/~dunigan/crc.html
+ Returns the value v with the bottom b [0,32] bits reflected. 
+ Example: reflect(0x3e23L,3) == 0x3e26
+*/
+uint32_t reflect(uint32_t v, int b) {
+       uint32_t t = v;
+       for ( int i = 0; i < b; ++i) {
+               if (t & 1)
+                       v |=  BITMASK((b-1)-i);
+               else
+                       v &= ~BITMASK((b-1)-i);
+               t>>=1;
+       }
+       return v;
+}
+
+uint64_t HornerScheme(uint64_t num, uint64_t divider, uint64_t factor) {
+   uint64_t remainder=0, quotient=0, result=0;
+   remainder = num % divider;
+   quotient = num / divider;
+   if(!(quotient == 0 && remainder == 0))
+   result += HornerScheme(quotient, divider, factor) * factor + remainder;
+   return result;
+}
\ No newline at end of file