X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/1f78a4d305cf7cab4682973bc00c6d391de777d6..1d537ad65c54d8821cf228a36fc15ac6e9764f50:/client/util.c

diff --git a/client/util.c b/client/util.c
index 6b47eab9..cea9f7d7 100644
--- a/client/util.c
+++ b/client/util.c
@@ -112,6 +112,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;
 	size_t i;
 
@@ -121,19 +122,25 @@ char * sprint_hex(const uint8_t * data, const size_t len) {
 	return buf;
 }
 
-char * sprint_bin(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];
-	char * tmp = buf;
-	size_t i;
+	memset(buf, 0x00, 1024);
+	char *tmp = buf;
 
-	for (i=0; i < maxLen; ++i, ++tmp)
-		sprintf(tmp, "%u", data[i]);
+	for (size_t i=0; i < maxLen; ++i){
+		sprintf(tmp++, "%u", data[i]);
+		if (breaks > 0 && !((i+1) % breaks))
+			sprintf(tmp++, "%s","\n");
+	}
 
 	return buf;
 }
 
+char *sprint_bin(const uint8_t *data, const size_t len) {
+	return sprint_bin_break(data, len, 0);
+}
 void num_to_bytes(uint64_t n, size_t len, uint8_t* dest)
 {
 	while (len--) {
@@ -153,6 +160,22 @@ uint64_t bytes_to_num(uint8_t* src, size_t len)
 	return num;
 }
 
+// aa,bb,cc,dd,ee,ff,gg,hh, ii,jj,kk,ll,mm,nn,oo,pp
+// 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(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 tmp;
+}
+
 //assumes little endian
 char * printBits(size_t const size, void const * const ptr)
 {
@@ -237,7 +260,6 @@ uint8_t param_get8(const char *line, int paramnum)
 uint8_t param_getdec(const char *line, int paramnum, uint8_t *destination)
 {
 	uint8_t val =  param_get8ex(line, paramnum, 255, 10);
-	printf("read %i", (int8_t ) val);
 	if( (int8_t) val == -1) return 1;
 	(*destination) = val;
 	return 0;