X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/a1689f417fc1a26be6f93f8e934d643fba51f3a7..905c55de2bbe642412b47ed4e92344096c817fac:/client/util.c diff --git a/client/util.c b/client/util.c index 586d930b..4adc4e70 100644 --- a/client/util.c +++ b/client/util.c @@ -12,11 +12,9 @@ #define MAX_BIN_BREAK_LENGTH (3072+384+1) #ifndef _WIN32 -#include -#include +#include -int ukbhit(void) -{ +int ukbhit(void) { int cnt = 0; int error; static struct termios Otty, Ntty; @@ -39,7 +37,6 @@ int ukbhit(void) } #else -#include int ukbhit(void) { return kbhit(); } @@ -47,7 +44,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 +52,19 @@ 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); + if (f) { + fclose(f); + f = NULL; + } } void AddLogHex(char *fileName, char *extData, const uint8_t * data, const size_t len){ @@ -71,28 +72,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" PRIx64 "", 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,6 +109,7 @@ 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) { int rownum = 0; @@ -130,37 +137,38 @@ 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 rowlen; if (breaks==0) - max_len = ( len > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len; + rowlen = ( len > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len; else - max_len = ( len+(len/breaks) > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len+(len/breaks); + rowlen = ( len+(len/breaks) > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len+(len/breaks); static char buf[MAX_BIN_BREAK_LENGTH]; // 3072 + end of line characters if broken at 8 bits //clear memory 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 < rowlen-1; out_index++) { // set character sprintf(tmp++, "%u", 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) ) { + if ( (breaks > 0) && !((in_index+1) % breaks) && (out_index+1 != rowlen) ) { // increment and print line break out_index++; sprintf(tmp++, "%s","\n"); - } + } in_index++; } - + // last char. + sprintf(tmp++, "%u", data[in_index]); return buf; } @@ -173,41 +181,73 @@ char *sprint_hex_ascii(const uint8_t *data, const size_t len) { char *tmp = buf; memset(buf, 0x00, 1024); size_t max_len = (len > 1010) ? 1010 : len; - sprintf(tmp, "%s| %s", sprint_hex(data, max_len) , data); + + sprintf(tmp, "%s| ", sprint_hex(data, max_len) ); + + size_t i = 0; + size_t pos = (max_len * 3)+2; + while(i < max_len){ + char c = data[i]; + if ( (c < 32) || (c == 127)) + c = '.'; + sprintf(tmp+pos+i, "%c", c); + ++i; + } return buf; } -void num_to_bytes(uint64_t n, size_t len, uint8_t* dest) -{ + +char *sprint_ascii(const uint8_t *data, const size_t len) { + static char buf[1024]; + char *tmp = buf; + memset(buf, 0x00, 1024); + size_t max_len = (len > 1010) ? 1010 : len; + size_t i = 0; + while(i < max_len){ + char c = data[i]; + tmp[i] = ((c < 32) || (c == 127)) ? '.' : c; + ++i; + } + return buf; +} + +void num_to_bytes(uint64_t n, size_t len, uint8_t* dest) { while (len--) { - dest[len] = (uint8_t) n; + dest[len] = n & 0xFF; n >>= 8; } } -uint64_t bytes_to_num(uint8_t* src, size_t len) -{ +uint64_t bytes_to_num(uint8_t* src, size_t len) { uint64_t num = 0; - while (len--) - { + while (len--) { num = (num << 8) | (*src); src++; } 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 // 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){ - uint8_t buf[64]; + static uint8_t buf[64]; memset(buf, 0x00, 64); uint8_t *tmp = buf; for (uint8_t block=0; block < (uint8_t)(len/blockSize); block++){ @@ -215,9 +255,11 @@ uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockS tmp[i+(blockSize*block)] = src[(blockSize-1-i)+(blockSize*block)]; } } - return tmp; + return buf; } +// 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++){ @@ -226,7 +268,6 @@ void SwapEndian64ex(const uint8_t *src, const size_t len, const uint8_t blockSiz } } - // ------------------------------------------------------------------------- // string parameters lib // ------------------------------------------------------------------------- @@ -265,13 +306,10 @@ int param_getptr(const char *line, int *bg, int *en, int paramnum) return 0; } - char param_getchar(const char *line, int paramnum) { int bg, en; - if (param_getptr(line, &bg, &en, paramnum)) return 0x00; - return line[bg]; } @@ -312,7 +350,6 @@ uint8_t param_isdec(const char *line, int paramnum) uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base) { int bg, en; - if (!param_getptr(line, &bg, &en, paramnum)) return strtoul(&line[bg], NULL, base) & 0xff; else @@ -322,7 +359,6 @@ uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base) uint32_t param_get32ex(const char *line, int paramnum, int deflt, int base) { int bg, en; - if (!param_getptr(line, &bg, &en, paramnum)) return strtoul(&line[bg], NULL, base); else @@ -332,18 +368,16 @@ uint32_t param_get32ex(const char *line, int paramnum, int deflt, int base) uint64_t param_get64ex(const char *line, int paramnum, int deflt, int base) { int bg, en; - if (!param_getptr(line, &bg, &en, paramnum)) return strtoull(&line[bg], NULL, base); else return deflt; - - return 0; } int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt) { - int bg, en, temp, i; + int bg, en, i; + uint32_t temp; if (hexcnt & 1) return 1; @@ -362,7 +396,8 @@ int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt) } int param_gethex_ex(const char *line, int paramnum, uint8_t * data, int *hexcnt) { - int bg, en, temp, i; + int bg, en, i; + uint32_t temp; //if (hexcnt % 2) // return 1; @@ -385,7 +420,6 @@ int param_gethex_ex(const char *line, int paramnum, uint8_t * data, int *hexcnt) int param_getstr(const char *line, int paramnum, char * str) { int bg, en; - if (param_getptr(line, &bg, &en, paramnum)) return 0; memcpy(str, line + bg, en - bg + 1); @@ -491,6 +525,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; @@ -499,7 +534,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; @@ -524,10 +562,37 @@ 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 +// And clears the rest of the bits. uint32_t SwapBits(uint32_t value, int nrbits) { uint32_t newvalue = 0; for(int i = 0; i < nrbits; i++) { newvalue ^= ((value >> i) & 1) << (nrbits - 1 - i); } return newvalue; +} +/* + ref http://www.csm.ornl.gov/~dunigan/crc.html + Returns the value v with the bottom b [0,32] bits reflected. + Example: reflect(0x3e23L,3) == 0x3e26 +*/ +uint32_t reflect(uint32_t v, int b) { + uint32_t t = v; + for ( int i = 0; i < b; ++i) { + if (t & 1) + v |= BITMASK((b-1)-i); + else + v &= ~BITMASK((b-1)-i); + t>>=1; + } + return v; +} + +uint64_t HornerScheme(uint64_t num, uint64_t divider, uint64_t factor) { + uint64_t remainder=0, quotient=0, result=0; + remainder = num % divider; + quotient = num / divider; + if(!(quotient == 0 && remainder == 0)) + result += HornerScheme(quotient, divider, factor) * factor + remainder; + return result; } \ No newline at end of file