Potential fix for 0-length usb packets seen on OSX

[proxmark3-svn] / client / util.c

diff --git a/client/util.c b/client/util.c
index bce1c122e7857f923e6cece70d97e6554a84c907..9f2142c6a4114d7c2e6f50f6ac97fca70c709522 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -108,11 +108,12 @@ void print_hex(const uint8_t * data, const size_t len)
        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];
-       char * tmp = buf;
+       memset(buf, 0x00, 1024);
+       char *tmp = buf;
        size_t i;
 
        for (i=0; i < maxLen; ++i, tmp += 3)
@@ -121,19 +122,25 @@ char * sprint_hex(const uint8_t * data, const size_t len) {
        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 > 1024) ? 1024 : len;
+       int maxLen = ( len > 1020) ? 1020 : len;
        static char buf[1024];
-       char * tmp = buf;
-       size_t i;
+       memset(buf, 0x00, 1024);
+       char *tmp = buf;
 
-       for (i=0; i < maxLen; ++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;
 }
 
+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--) {
@@ -153,6 +160,22 @@ uint64_t bytes_to_num(uint8_t* src, size_t len)
        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)
 {
@@ -213,6 +236,7 @@ int param_getptr(const char *line, int *bg, int *en, int paramnum)
        return 0;
 }
 
+
 char param_getchar(const char *line, int paramnum)
 {
        int bg, en;
@@ -228,14 +252,15 @@ uint8_t param_get8(const char *line, int paramnum)
 }
 
 /**
- * @brief Reads a decimal integer
+ * @brief Reads a decimal integer (actually, 0-254, not 255)
  * @param line
  * @param paramnum
- * @return
+ * @return -1 if error
  */
 uint8_t param_getdec(const char *line, int paramnum, uint8_t *destination)
 {
-       uint8_t val = param_get8ex(line, paramnum, 10, 10);
+       uint8_t val =  param_get8ex(line, paramnum, 255, 10);
+       if( (int8_t) val == -1) return 1;
        (*destination) = val;
        return 0;
 }
@@ -369,7 +394,7 @@ int hextobinstring(char *target, char *source)
 
 // 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)
+int binarraytohex(char *target,char *source, int length)
 {
     unsigned char i, x;
     int j = length;
@@ -419,3 +444,12 @@ void wiegand_add_parity(char *target, char *source, char 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];
+}