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

diff --git a/client/util.c b/client/util.c
index 04daffc2..99a26a40 100644
--- a/client/util.c
+++ b/client/util.c
@@ -9,6 +9,7 @@
 //-----------------------------------------------------------------------------
 
 #include "util.h"
+#include "proxmark3.h"
 #define MAX_BIN_BREAK_LENGTH   (3072+384+1)
 
 #ifndef _WIN32
@@ -47,7 +48,7 @@ int ukbhit(void) {
 
 // log files functions
 void AddLogLine(char *file, char *extData, char *c) {
-	FILE *fLog = NULL;
+	FILE *f = NULL;
     char filename[FILE_PATH_SIZE] = {0x00};
     int len = 0;
 
@@ -55,15 +56,16 @@ void AddLogLine(char *file, char *extData, char *c) {
     if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
     memcpy(filename, file, len);
    
-	fLog = fopen(filename, "a");
-	if (!fLog) {
+	f = fopen(filename, "a");
+	if (!f) {
 		printf("Could not append log file %s", filename);
 		return;
 	}
 
-	fprintf(fLog, "%s", extData);
-	fprintf(fLog, "%s\n", c);
-	fclose(fLog);
+	fprintf(f, "%s", extData);
+	fprintf(f, "%s\n", c);
+	fflush(f);
+	fclose(f);
 }
 
 void AddLogHex(char *fileName, char *extData, const uint8_t * data, const size_t len){
@@ -71,28 +73,33 @@ void AddLogHex(char *fileName, char *extData, const uint8_t * data, const size_t
 }
 
 void AddLogUint64(char *fileName, char *extData, const uint64_t data) {
-  char buf[100] = {0};
-	sprintf(buf, "%x%x", (unsigned int)((data & 0xFFFFFFFF00000000) >> 32), (unsigned int)(data & 0xFFFFFFFF));
+	char buf[20] = {0};
+	memset(buf, 0x00, sizeof(buf));
+	//sprintf(buf, "%X%X", (unsigned int)((data & 0xFFFFFFFF00000000) >> 32), (unsigned int)(data & 0xFFFFFFFF));
+	sprintf(buf, "%012"llx"", data);
 	AddLogLine(fileName, extData, buf);
 }
 
 void AddLogCurrentDT(char *fileName) {
-	char buff[20];
+	char buf[20];
+	memset(buf, 0x00, sizeof(buf));
 	struct tm *curTime;
-
 	time_t now = time(0);
 	curTime = gmtime(&now);
-
-	strftime (buff, sizeof(buff), "%Y-%m-%d %H:%M:%S", curTime);
-	AddLogLine(fileName, "\nanticollision: ", buff);
+	strftime (buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", curTime);
+	AddLogLine(fileName, "\nanticollision: ", buf);
 }
 
-void FillFileNameByUID(char *fileName, uint8_t * uid, char *ext, int byteCount) {
+void FillFileNameByUID(char *fileName, uint8_t *uid, char *ext, int byteCount) {
+	if ( fileName == NULL || uid == NULL || ext == NULL ){
+		printf("error: parameter is NULL\n");
+		return;
+	}
 	char * fnameptr = fileName;
-	memset(fileName, 0x00, 200);
+	memset(fileName, 0x00, FILE_PATH_SIZE);
 	
 	for (int j = 0; j < byteCount; j++, fnameptr += 2)
-		sprintf(fnameptr, "%02x", uid[j]); 
+		sprintf(fnameptr, "%02X", uid[j]); 
 	sprintf(fnameptr, "%s", ext); 
 }
 
@@ -103,15 +110,20 @@ void print_hex(const uint8_t * data, const size_t len) {
 		printf("%02x ", data[i]);
 	printf("\n");
 }
+
 void print_hex_break(const uint8_t *data, const size_t len, uint8_t breaks) {
-	size_t i;
-	for ( i = 0; i < len; ++i) {
+
+	int rownum = 0;
+	printf("[%02d] | ", rownum);
+	for (int i = 0; i < len; ++i) {
 
 		printf("%02X ", data[i]);
 		
 		// check if a line break is needed
-		if ( (breaks > 0) && (i > 0) && !(i % breaks) )
-			printf("(%d %d)\n", i , breaks);
+		if ( breaks > 0 && !((i+1) % breaks) && (i+1 < len) ) {
+			++rownum;
+			printf("\n[%02d] | ", rownum);
+		}
 	}
 	printf("\n");
 }
@@ -126,13 +138,14 @@ char *sprint_hex(const uint8_t *data, const size_t len) {
 
 	for (i=0; i < maxLen; ++i, tmp += 3)
 		sprintf(tmp, "%02X ", data[i]);
-
 	return buf;
 }
 
 char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t breaks) {
+	
 	// make sure we don't go beyond our char array memory
-	int max_len;
+	size_t in_index = 0, out_index = 0;
+	int max_len;	
 	if (breaks==0)
 		max_len = ( len > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len;
 	else
@@ -143,20 +156,20 @@ char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t brea
 	memset(buf, 0x00, sizeof(buf));
 	char *tmp = buf;
 
-	size_t in_index = 0;
 	// loop through the out_index to make sure we don't go too far
-	for (size_t out_index=0; out_index < max_len-2; out_index++) {
+	for (out_index=0; out_index < max_len-2; out_index++) {
 		// set character
-		sprintf(tmp++, "%u", data[in_index]);
+		sprintf(tmp++, "%u", (unsigned int) data[in_index]);
 		// check if a line break is needed and we have room to print it in our array
 		if ( (breaks > 0) && !((in_index+1) % breaks) && (out_index+1 != max_len) ) {
 			// increment and print line break
 			out_index++;
 			sprintf(tmp++, "%s","\n");
-	}
+		}
 		in_index++;
 	}
-
+	// last char.
+	sprintf(tmp++, "%u", (unsigned int) data[in_index]);
 	return buf;
 }
 
@@ -172,6 +185,7 @@ char *sprint_hex_ascii(const uint8_t *data, const size_t len) {
 	sprintf(tmp, "%s| %s", sprint_hex(data, max_len) , data);	
 	return buf;
 }
+
 void num_to_bytes(uint64_t n, size_t len, uint8_t* dest)
 {
 	while (len--) {
@@ -191,12 +205,21 @@ uint64_t bytes_to_num(uint8_t* src, size_t len)
 	return num;
 }
 
-void num_to_bytebits(uint64_t	n, size_t len, uint8_t *dest) {
+// takes a number (uint64_t) and creates a binarray in dest.
+void num_to_bytebits(uint64_t n, size_t len, uint8_t *dest) {
 	while (len--) {
 		dest[len] = n & 1;
 		n >>= 1;
 	}
 }
+//least significant bit first
+void num_to_bytebitsLSBF(uint64_t n, size_t len, uint8_t *dest) {
+	for(int i = 0 ; i < len ; ++i) {
+		dest[i] =  n & 1;
+		n >>= 1;
+	}
+}
+
 
 // aa,bb,cc,dd,ee,ff,gg,hh, ii,jj,kk,ll,mm,nn,oo,pp
 // to
@@ -214,6 +237,8 @@ uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockS
 	return tmp;
 }
 
+// takes a uint8_t src array, for len items and reverses the byte order in blocksizes (8,16,32,64), 
+// returns: the dest array contains the reordered src array.
 void SwapEndian64ex(const uint8_t *src, const size_t len, const uint8_t blockSize, uint8_t *dest){
 	for (uint8_t block=0; block < (uint8_t)(len/blockSize); block++){
 		for (size_t i = 0; i < blockSize; i++){
@@ -222,7 +247,6 @@ void SwapEndian64ex(const uint8_t *src, const size_t len, const uint8_t blockSiz
 	}
 }
 
-
 //  -------------------------------------------------------------------------
 //  string parameters lib
 //  -------------------------------------------------------------------------
@@ -487,6 +511,7 @@ void wiegand_add_parity(uint8_t *target, uint8_t *source, uint8_t length)
     *(target)= GetParity(source + length / 2, ODD, length / 2);
 }
 
+// xor two arrays together for len items.  The dst array contains the new xored values.
 void xor(unsigned char * dst, unsigned char * src, size_t len) {
    for( ; len > 0; len--,dst++,src++)
        *dst ^= *src;
@@ -495,7 +520,10 @@ void xor(unsigned char * dst, unsigned char * src, size_t len) {
 int32_t le24toh (uint8_t data[3]) {
     return (data[2] << 16) | (data[1] << 8) | data[0];
 }
-
+uint32_t le32toh (uint8_t *data) {
+	return (uint32_t)( (data[3]<<24) | (data[2]<<16) | (data[1]<<8) | data[0]);
+}
+// Pack a bitarray into a uint32_t.  
 uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits) {
 
 	if (len > 32) return 0;
@@ -520,6 +548,7 @@ void rol(uint8_t *data, const size_t len){
     data[len-1] = first;
 }
 
+// Swap bit order on a uint32_t value.  Can be limited by nrbits just use say 8bits reversal
 uint32_t SwapBits(uint32_t value, int nrbits) {
 	uint32_t newvalue = 0;
 	for(int i = 0; i < nrbits; i++) {