X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/9332b857ffeee343334064d3ca53048f59c55e50..13629a71d3f77223281a2dcec5375e038419a808:/client/util.c diff --git a/client/util.c b/client/util.c index 159929b5..9768dbeb 100644 --- a/client/util.c +++ b/client/util.c @@ -21,14 +21,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); @@ -97,14 +97,27 @@ void FillFileNameByUID(char *fileName, uint8_t * uid, char *ext, int byteCount) } // 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"); } @@ -123,8 +136,10 @@ char *sprint_hex(const uint8_t *data, const size_t len) { } 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 @@ -135,20 +150,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; 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; } @@ -158,11 +173,13 @@ char *sprint_bin(const uint8_t *data, const size_t len) { char *sprint_hex_ascii(const uint8_t *data, const size_t len) { static char buf[1024]; - memset(buf, 0x00, 1024); char *tmp = buf; - sprintf(tmp, "%s| %s", sprint_hex(data, len) , data); + memset(buf, 0x00, 1024); + size_t max_len = (len > 1010) ? 1010 : 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--) { @@ -182,19 +199,29 @@ 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 // 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]; + uint8_t buf[64]; memset(buf, 0x00, 64); uint8_t *tmp = buf; for (uint8_t block=0; block < (uint8_t)(len/blockSize); block++){ @@ -205,6 +232,16 @@ 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++){ + dest[i+(blockSize*block)] = src[(blockSize-1-i)+(blockSize*block)]; + } + } +} + // ------------------------------------------------------------------------- // string parameters lib // ------------------------------------------------------------------------- @@ -454,11 +491,9 @@ void binarraytobinstring(char *target, char *source, 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; } @@ -471,6 +506,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; @@ -480,6 +516,7 @@ int32_t le24toh (uint8_t data[3]) { return (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; @@ -494,11 +531,21 @@ uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits) { return tmp; } -// RotateLeft - Ultralight, Desfire -void rol(uint8_t *data, const size_t len){ +// 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