FIX: @marshmellow42 's ST detection fix.

[proxmark3-svn] / client / util.c

diff --git a/client/util.c b/client/util.c
index 4bbc992e588cfb381d703083b5f976994faae5b5..4adc4e701866f4d86628211a764da761e8734266 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -9,15 +9,12 @@
 //-----------------------------------------------------------------------------
 
 #include "util.h"
 //-----------------------------------------------------------------------------
 
 #include "util.h"

-#include "proxmark3.h"

 #define MAX_BIN_BREAK_LENGTH   (3072+384+1)
 
 #ifndef _WIN32
 #define MAX_BIN_BREAK_LENGTH   (3072+384+1)
 
 #ifndef _WIN32

-#include <termios.h>
-#include <sys/ioctl.h> 
+#include <sys/ttydefaults.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;


@@ -40,7 +37,6 @@ int ukbhit(void)
 }
 
 #else
 }
 
 #else

-#include <conio.h>

 int ukbhit(void) {
        return kbhit();
 }
 int ukbhit(void) {
        return kbhit();
 }


@@ -65,7 +61,10 @@ void AddLogLine(char *file, char *extData, char *c) {
        fprintf(f, "%s", extData);
        fprintf(f, "%s\n", c);
        fflush(f);
        fprintf(f, "%s", extData);
        fprintf(f, "%s\n", c);
        fflush(f);

-       fclose(f);
+       if (f) {
+               fclose(f);
+               f = NULL;
+       }

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


@@ -76,7 +75,7 @@ void AddLogUint64(char *fileName, char *extData, const uint64_t data) {
        char buf[20] = {0};
        memset(buf, 0x00, sizeof(buf));
        //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);
+       sprintf(buf, "%012" PRIx64 "", data);

        AddLogLine(fileName, extData, buf);
 }
 
        AddLogLine(fileName, extData, buf);
 }
 


@@ -145,11 +144,11 @@ char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t brea
        
        // make sure we don't go beyond our char array memory
        size_t in_index = 0, out_index = 0;
        
        // make sure we don't go beyond our char array memory
        size_t in_index = 0, out_index = 0;

-       int max_len;    
+       int rowlen;     

        if (breaks==0)
        if (breaks==0)

-               max_len = ( len > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len;
+               rowlen = ( len > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len;

        else
        else

-               max_len = ( len+(len/breaks) > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len+(len/breaks);
+               rowlen = ( 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
 
        static char buf[MAX_BIN_BREAK_LENGTH]; // 3072 + end of line characters if broken at 8 bits
        //clear memory


@@ -157,11 +156,11 @@ char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t brea
        char *tmp = buf;
 
        // loop through the out_index to make sure we don't go too far
        char *tmp = buf;
 
        // 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++) {
+       for (out_index=0; out_index < rowlen-1; out_index++) {

                // set character
                // set character

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

                // check if a line break is needed and we have room to print it in our array
                // 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) ) {
+               if ( (breaks > 0) && !((in_index+1) % breaks) && (out_index+1 != rowlen) ) {

                        // increment and print line break
                        out_index++;
                        sprintf(tmp++, "%s","\n");
                        // increment and print line break
                        out_index++;
                        sprintf(tmp++, "%s","\n");


@@ -169,7 +168,7 @@ char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t brea
                in_index++;
        }
        // last char.
                in_index++;
        }
        // last char.

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

        return buf;
 }
 
        return buf;
 }
 


@@ -182,13 +181,38 @@ char *sprint_hex_ascii(const uint8_t *data, const size_t len) {
        char *tmp = buf;
        memset(buf, 0x00, 1024);
        size_t max_len = (len > 1010) ? 1010 : len;
        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);       
+
+       sprintf(tmp, "%s| ", sprint_hex(data, max_len) );
+       
+       size_t i = 0;
+       size_t pos = (max_len * 3)+2;
+       while(i < max_len){
+               char c = data[i];
+               if ( (c < 32) || (c == 127))
+                       c = '.';
+               sprintf(tmp+pos+i, "%c",  c);
+               ++i;
+       }
+       return buf;
+}
+
+char *sprint_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;
+       size_t i = 0;
+       while(i < max_len){
+               char c = data[i];
+               tmp[i] = ((c < 32) || (c == 127)) ? '.' : c;
+               ++i;
+       }

        return buf;
 }
 
 void num_to_bytes(uint64_t n, size_t len, uint8_t* dest) {
        while (len--) {
        return buf;
 }
 
 void num_to_bytes(uint64_t n, size_t len, uint8_t* dest) {
        while (len--) {

-               dest[len] = (uint8_t) n;
+               dest[len] = n & 0xFF;

                n >>= 8;
        }
 }
                n >>= 8;
        }
 }


@@ -223,7 +247,7 @@ void num_to_bytebitsLSBF(uint64_t n, size_t len, uint8_t *dest) {
 // 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){
 // 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){

-       uint8_t buf[64];
+       static uint8_t buf[64];

        memset(buf, 0x00, 64);
        uint8_t *tmp = buf;
        for (uint8_t block=0; block < (uint8_t)(len/blockSize); block++){
        memset(buf, 0x00, 64);
        uint8_t *tmp = buf;
        for (uint8_t block=0; block < (uint8_t)(len/blockSize); block++){


@@ -231,7 +255,7 @@ uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockS
                        tmp[i+(blockSize*block)] = src[(blockSize-1-i)+(blockSize*block)];
                }
        }
                        tmp[i+(blockSize*block)] = src[(blockSize-1-i)+(blockSize*block)];
                }
        }

-       return tmp;
+       return buf;

 }
 
 // takes a uint8_t src array, for len items and reverses the byte order in blocksizes (8,16,32,64), 
 }
 
 // takes a uint8_t src array, for len items and reverses the byte order in blocksizes (8,16,32,64), 


@@ -282,13 +306,10 @@ 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;

-       

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

-

        return line[bg];
 }
 
        return line[bg];
 }
 


@@ -329,7 +350,6 @@ uint8_t param_isdec(const char *line, int paramnum)
 uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base)
 {
        int bg, en;
 uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base)
 {
        int bg, en;

-

        if (!param_getptr(line, &bg, &en, paramnum)) 
                return strtoul(&line[bg], NULL, base) & 0xff;
        else
        if (!param_getptr(line, &bg, &en, paramnum)) 
                return strtoul(&line[bg], NULL, base) & 0xff;
        else


@@ -339,7 +359,6 @@ uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base)
 uint32_t param_get32ex(const char *line, int paramnum, int deflt, int base)
 {
        int bg, en;
 uint32_t param_get32ex(const char *line, int paramnum, int deflt, int base)
 {
        int bg, en;

-

        if (!param_getptr(line, &bg, &en, paramnum)) 
                return strtoul(&line[bg], NULL, base);
        else
        if (!param_getptr(line, &bg, &en, paramnum)) 
                return strtoul(&line[bg], NULL, base);
        else


@@ -349,18 +368,16 @@ uint32_t param_get32ex(const char *line, int paramnum, int deflt, int base)
 uint64_t param_get64ex(const char *line, int paramnum, int deflt, int base)
 {
        int bg, en;
 uint64_t param_get64ex(const char *line, int paramnum, int deflt, int base)
 {
        int bg, en;

-

        if (!param_getptr(line, &bg, &en, paramnum)) 
                return strtoull(&line[bg], NULL, base);
        else
                return deflt;
        if (!param_getptr(line, &bg, &en, paramnum)) 
                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 param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt)
 {

-       int bg, en, temp, i;
+       int bg, en, i;
+       uint32_t temp;

 
        if (hexcnt & 1) return 1;
        
 
        if (hexcnt & 1) return 1;
        


@@ -379,7 +396,8 @@ int param_gethex(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 param_gethex_ex(const char *line, int paramnum, uint8_t * data, int *hexcnt)
 {

-       int bg, en, temp, i;
+       int bg, en, i;
+       uint32_t temp;

 
        //if (hexcnt % 2)
        //      return 1;
 
        //if (hexcnt % 2)
        //      return 1;


@@ -402,7 +420,6 @@ int param_gethex_ex(const char *line, int paramnum, uint8_t * data, int *hexcnt)
 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;

-

        if (param_getptr(line, &bg, &en, paramnum)) return 0;
        
        memcpy(str, line + bg, en - bg + 1);
        if (param_getptr(line, &bg, &en, paramnum)) return 0;
        
        memcpy(str, line + bg, en - bg + 1);


@@ -553,4 +570,29 @@ uint32_t SwapBits(uint32_t value, int nrbits) {
                newvalue ^= ((value >> i) & 1) << (nrbits - 1 - i);
        }
        return newvalue;
                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
 }
\ No newline at end of file