X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/c585a5cf0b96d30119e1adb45c69e579e475d046..be10fe2f11db33a4f96c573dc47c47822e1a8e9d:/client/util.c?ds=sidebyside diff --git a/client/util.c b/client/util.c index 54823422..cea9f7d7 100644 --- a/client/util.c +++ b/client/util.c @@ -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