fixed bug in util getpraram8 + reveng adjustments

[proxmark3-svn] / client / util.c

diff --git a/client/util.c b/client/util.c
index 5482342267adb5dd2f025c37b7c1ec2430aacfee..b114fc49cc2ec2d6a139321b0f665395d3159163 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -108,12 +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];
        memset(buf, 0x00, 1024);
-       char * tmp = buf;
+       char *tmp = buf;
        size_t i;
 
        for (i=0; i < maxLen; ++i, tmp += 3)
@@ -124,7 +124,7 @@ char * sprint_hex(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];
        memset(buf, 0x00, 1024);
        char *tmp = buf;
@@ -164,14 +164,16 @@ uint64_t bytes_to_num(uint8_t* src, size_t len)
 // 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 tmp;
 }
 
 //assumes little endian
@@ -246,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);
 }
 
 /**
@@ -392,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;
@@ -442,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];
+}