Create session key

[proxmark3-svn] / client / util.c

diff --git a/client/util.c b/client/util.c
index fa24906d1d32047cefe19ed3a9eb606919daa0ba..903791a09d03d832565e027e140aa4c926e9cb9f 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -13,6 +13,7 @@
 #ifndef _WIN32
 #include <termios.h>
 #include <sys/ioctl.h> 
 #ifndef _WIN32
 #include <termios.h>
 #include <sys/ioctl.h> 

+

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


@@ -102,16 +103,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--) {


@@ -131,6 +147,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
 //  -------------------------------------------------------------------------


@@ -188,7 +226,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;
 }


@@ -198,7 +236,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;
 }


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