X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/1eb874ee3f7690cc92a720c0636fbe100e82b1e5..a360a90bb613c17bf6ee57f2e50d267579480b1b:/client/util.c?ds=inline diff --git a/client/util.c b/client/util.c index b8d5c316..99a26a40 100644 --- a/client/util.c +++ b/client/util.c @@ -9,6 +9,8 @@ //----------------------------------------------------------------------------- #include "util.h" +#include "proxmark3.h" +#define MAX_BIN_BREAK_LENGTH (3072+384+1) #ifndef _WIN32 #include @@ -20,15 +22,14 @@ int ukbhit(void) int error; static struct termios Otty, Ntty; - - tcgetattr( 0, &Otty); + if ( tcgetattr( 0, &Otty) == -1) return -1; Ntty = Otty; - Ntty.c_iflag = 0; /* input mode */ - Ntty.c_oflag = 0; /* output mode */ - Ntty.c_lflag &= ~ICANON; /* raw mode */ - Ntty.c_cc[VMIN] = CMIN; /* minimum time to wait */ - Ntty.c_cc[VTIME] = CTIME; /* minimum characters to wait for */ + Ntty.c_iflag = 0; /* input mode */ + Ntty.c_oflag = 0; /* output mode */ + Ntty.c_lflag &= ~ICANON; /* raw mode */ + Ntty.c_cc[VMIN] = CMIN; /* minimum time to wait */ + Ntty.c_cc[VTIME] = CTIME; /* minimum characters to wait for */ if (0 == (error = tcsetattr(0, TCSANOW, &Ntty))) { error += ioctl(0, FIONREAD, &cnt); @@ -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,66 +73,116 @@ 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); } // printing and converting functions - -void print_hex(const uint8_t * data, const size_t len) -{ +void print_hex(const uint8_t * data, const size_t len) { size_t i; - - for (i=0; i < len; i++) + for (i=0; i < len; ++i) printf("%02x ", data[i]); + printf("\n"); +} + +void print_hex_break(const uint8_t *data, const size_t len, uint8_t breaks) { + 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+1) % breaks) && (i+1 < len) ) { + ++rownum; + printf("\n[%02d] | ", rownum); + } + } 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(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; - static char buf[1024]; - char * tmp = buf; - size_t i; + // make sure we don't go beyond our char array memory + 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 + max_len = ( 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; + + // loop through the out_index to make sure we don't go too far + for (out_index=0; out_index < max_len-2; out_index++) { + // set character + 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; +} - for (i=0; i < maxLen; ++i, ++tmp) - sprintf(tmp, "%u", data[i]); +char *sprint_bin(const uint8_t *data, const size_t len) { + return sprint_bin_break(data, len, 0); +} +char *sprint_hex_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; + sprintf(tmp, "%s| %s", sprint_hex(data, max_len) , data); return buf; } @@ -153,26 +205,46 @@ uint64_t bytes_to_num(uint8_t* src, size_t len) return num; } -//assumes little endian -char * printBits(size_t const size, void const * const ptr) -{ - unsigned char *b = (unsigned char*) ptr; - unsigned char byte; - static char buf[1024]; - char * tmp = buf; - int i, j; +// 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; + } +} - for (i=size-1;i>=0;i--) - { - for (j=7;j>=0;j--) - { - byte = b[i] & (1<>= j; - sprintf(tmp, "%u", byte); - tmp++; - } - } - return buf; + +// 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]; + 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; +} + +// 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++){ + dest[i+(blockSize*block)] = src[(blockSize-1-i)+(blockSize*block)]; + } + } } // ------------------------------------------------------------------------- @@ -213,6 +285,7 @@ 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; @@ -224,7 +297,36 @@ 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); +} + +/** + * @brief Reads a decimal integer (actually, 0-254, not 255) + * @param line + * @param paramnum + * @return -1 if error + */ +uint8_t param_getdec(const char *line, int paramnum, uint8_t *destination) +{ + uint8_t val = param_get8ex(line, paramnum, 255, 10); + if( (int8_t) val == -1) return 1; + (*destination) = val; + return 0; +} +/** + * @brief Checks if param is decimal + * @param line + * @param paramnum + * @return + */ +uint8_t param_isdec(const char *line, int paramnum) +{ + int bg, en; + //TODO, check more thorougly + if (!param_getptr(line, &bg, &en, paramnum)) return 1; + // return strtoul(&line[bg], NULL, 10) & 0xff; + + return 0; } uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base) @@ -263,13 +365,11 @@ int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt) { int bg, en, temp, i; - if (hexcnt % 2) - return 1; + if (hexcnt & 1) return 1; if (param_getptr(line, &bg, &en, paramnum)) return 1; - if (en - bg + 1 != hexcnt) - return 1; + if (en - bg + 1 != hexcnt) return 1; for(i = 0; i < hexcnt; i += 2) { if (!(isxdigit(line[bg + i]) && isxdigit(line[bg + i + 1])) ) return 1; @@ -280,7 +380,28 @@ int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt) return 0; } +int param_gethex_ex(const char *line, int paramnum, uint8_t * data, int *hexcnt) +{ + int bg, en, temp, i; + + //if (hexcnt % 2) + // return 1; + + if (param_getptr(line, &bg, &en, paramnum)) return 1; + + *hexcnt = en - bg + 1; + if (*hexcnt % 2) //error if not complete hex bytes + return 1; + for(i = 0; i < *hexcnt; i += 2) { + if (!(isxdigit(line[bg + i]) && isxdigit(line[bg + i + 1])) ) return 1; + + sscanf((char[]){line[bg + i], line[bg + i + 1], 0}, "%X", &temp); + data[i / 2] = temp & 0xff; + } + + return 0; +} int param_getstr(const char *line, int paramnum, char * str) { int bg, en; @@ -372,22 +493,66 @@ void binarraytobinstring(char *target, char *source, int length) } // return parity bit required to match type -uint8_t GetParity( char *bits, uint8_t type, int length) +uint8_t GetParity( uint8_t *bits, uint8_t type, int length) { int x; - - for(x= 0 ; length > 0 ; --length) + for( x = 0 ; length > 0 ; --length) x += bits[length - 1]; x %= 2; - return x ^ type; } // add HID parity to binary array: EVEN prefix for 1st half of ID, ODD suffix for 2nd half -void wiegand_add_parity(char *target, char *source, char length) +void wiegand_add_parity(uint8_t *target, uint8_t *source, uint8_t length) { *(target++)= GetParity(source, EVEN, length / 2); memcpy(target, source, length); target += 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; +} + +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; + + int i = start; + int j = len-1; + uint32_t tmp = 0; + + for (; j >= 0; --j, ++i) + tmp |= bits[i] << j; + + return tmp; +} + +// RotateLeft - Ultralight, Desfire, works on byte level +// 00-01-02 >> 01-02-00 +void rol(uint8_t *data, const size_t len){ + uint8_t first = data[0]; + for (size_t i = 0; i < len-1; i++) { + data[i] = data[i+1]; + } + 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++) { + newvalue ^= ((value >> i) & 1) << (nrbits - 1 - i); + } + return newvalue; +} \ No newline at end of file