X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/e1c88b09651b354db1d99c0df0788602ed5de65f..f53020e729d583f7975095ca7b4b467741d99edb:/client/util.c?ds=inline

diff --git a/client/util.c b/client/util.c
index 5bb98fd7..797a9392 100644
--- a/client/util.c
+++ b/client/util.c
@@ -108,23 +108,25 @@ 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;
 	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;
 
 	for (size_t i=0; i < maxLen; ++i){
@@ -162,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
@@ -244,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);
 }
 
 /**
@@ -440,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;
+}