X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/0d2c590974319db6fc54400ce153d86b68a09852..4490a4769074e6b5a91f9da1bee2296ac2b42f5f:/client/util.c?ds=sidebyside diff --git a/client/util.c b/client/util.c index 9768dbeb..c5c7d7fe 100644 --- a/client/util.c +++ b/client/util.c @@ -15,8 +15,7 @@ #include #include -int ukbhit(void) -{ +int ukbhit(void) { int cnt = 0; int error; static struct termios Otty, Ntty; @@ -47,7 +46,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 +54,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 +71,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); } @@ -131,7 +136,6 @@ 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; } @@ -180,19 +184,16 @@ char *sprint_hex_ascii(const uint8_t *data, const size_t len) { return buf; } -void num_to_bytes(uint64_t n, size_t len, uint8_t* dest) -{ +void num_to_bytes(uint64_t n, size_t len, uint8_t* dest) { while (len--) { dest[len] = (uint8_t) n; 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++; } @@ -206,22 +207,21 @@ void num_to_bytebits(uint64_t n, size_t len, uint8_t *dest) { n >>= 1; } } + //least significant bit first -void num_to_bytebitsLSBF(uint64_t n, size_t len, uint8_t *dest) -{ +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++){ @@ -229,7 +229,7 @@ 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), @@ -280,7 +280,6 @@ 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; @@ -352,8 +351,6 @@ uint64_t param_get64ex(const char *line, int paramnum, int deflt, int base) return strtoull(&line[bg], NULL, base); else return deflt; - - return 0; } int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt) @@ -515,7 +512,9 @@ 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) { @@ -542,10 +541,36 @@ void rol(uint8_t *data, const size_t len){ } // 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