X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/664bb5ae720fb546a459dc6e60b3864d7ecd56ca..c3c241f389048bd14422d70504cecec6637b89f3:/client/util.c diff --git a/client/util.c b/client/util.c index 1c8081bf..30547080 100644 --- a/client/util.c +++ b/client/util.c @@ -113,7 +113,7 @@ 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) @@ -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 @@ -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]; +}