gitignore updated because of new bin

[proxmark3-svn] / client / util.c

diff --git a/client/util.c b/client/util.c
index 0dd6905e7d7754750d84a2bff4634067f2b8623a..797a93927e16ae57a6598ee905840bcfc3962ca8 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -108,7 +108,7 @@ 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];
@@ -117,14 +117,14 @@ char * sprint_hex(const uint8_t * data, const size_t len) {
        size_t i;
 
        for (i=0; i < maxLen; ++i, tmp += 3)
-               sprintf(tmp, "%02x ", data[i]);
+               sprintf(tmp, "%02X ", data[i]);
 
        return buf;
 }
 
 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];
        memset(buf, 0x00, 1024);
        char *tmp = buf;
@@ -248,7 +248,7 @@ char param_getchar(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);
 }
 
 /**
@@ -444,3 +444,27 @@ 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];
+}
+
+
+uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits) {
+       
+       int i = start;
+       int j = len-1;
+
+       if (len > 32) return 0;
+
+       uint32_t tmp = 0;
+       for (; j >= 0; --j, ++i)
+               tmp     |= bits[i] << j;
+
+       return tmp;
+}