X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/fecfd86d3ddade989dd7bba8899c520e5a4faa95..f98702bace48fde3ec1492d1c732e23cd2eb8613:/client/util.c
diff --git a/client/util.c b/client/util.c
index d07c915c..cd18fc00 100644
--- a/client/util.c
+++ b/client/util.c
@@ -8,10 +8,6 @@
// utilities
//-----------------------------------------------------------------------------
-#if !defined(_WIN32)
-#define _POSIX_C_SOURCE 199309L // need nanosleep()
-#endif
-
#include "util.h"
#include <stdint.h>
@@ -20,7 +16,11 @@
#include <stdlib.h>
#include <stdio.h>
#include <time.h>
-#include "data.h"
+#include <stdarg.h>
+
+#ifdef _WIN32
+#include <windows.h>
+#endif
#define MAX_BIN_BREAK_LENGTH (3072+384+1)
@@ -52,7 +52,22 @@ int ukbhit(void)
return ( error == 0 ? cnt : -1 );
}
-#else
+char getch(void)
+{
+ char c;
+ int error;
+ struct termios Otty, Ntty;
+ if ( tcgetattr(STDIN_FILENO, &Otty) == -1 ) return -1;
+ Ntty = Otty;
+ Ntty.c_lflag &= ~ICANON; /* disable buffered i/o */
+ if (0 == (error = tcsetattr(STDIN_FILENO, TCSANOW, &Ntty))) { // set new attributes
+ c = getchar();
+ error += tcsetattr(STDIN_FILENO, TCSANOW, &Otty); // reset attributes
+ }
+ return ( error == 0 ? c : -1 );
+}
+
+#else // _WIN32
#include <conio.h>
int ukbhit(void) {
@@ -102,58 +117,102 @@ void AddLogCurrentDT(char *fileName) {
AddLogLine(fileName, "\nanticollision: ", buff);
}
-void FillFileNameByUID(char *fileName, uint8_t * uid, char *ext, int byteCount) {
+void FillFileNameByUID(char *fileName, uint8_t *uid, char *ext, int byteCount) {
char * fnameptr = fileName;
- memset(fileName, 0x00, 200);
for (int j = 0; j < byteCount; j++, fnameptr += 2)
sprintf(fnameptr, "%02x", (unsigned int) uid[j]);
sprintf(fnameptr, "%s", ext);
}
-// printing and converting functions
+// fill buffer from structure [{uint8_t data, size_t length},...]
+int FillBuffer(uint8_t *data, size_t maxDataLength, size_t *dataLength, ...) {
+ *dataLength = 0;
+ va_list valist;
+ va_start(valist, dataLength);
+
+ uint8_t *vdata = NULL;
+ size_t vlength = 0;
+ do{
+ vdata = va_arg(valist, uint8_t *);
+ if (!vdata)
+ break;
+
+ vlength = va_arg(valist, size_t);
+ if (*dataLength + vlength > maxDataLength) {
+ va_end(valist);
+ return 1;
+ }
+
+ memcpy(&data[*dataLength], vdata, vlength);
+ *dataLength += vlength;
+
+ } while (vdata);
+
+ va_end(valist);
-void print_hex(const uint8_t * data, const size_t len)
-{
- size_t i;
+ return 0;
+}
- for (i=0; i < len; i++)
- printf("%02x ", data[i]);
+bool CheckStringIsHEXValue(const char *value) {
+ for (int i = 0; i < strlen(value); i++)
+ if (!isxdigit(value[i]))
+ return false;
- printf("\n");
+ if (strlen(value) % 2)
+ return false;
+
+ return true;
}
-void print_hex_break(const uint8_t *data, const size_t len, uint8_t breaks) {
+void hex_to_buffer(const uint8_t *buf, const uint8_t *hex_data, const size_t hex_len, const size_t hex_max_len,
+ const size_t min_str_len, const size_t spaces_between, bool uppercase) {
+
+ char *tmp = (char *)buf;
+ size_t i;
+ memset(tmp, 0x00, hex_max_len);
- int rownum = 0;
- printf("[%02d] | ", rownum);
- for (int i = 0; i < len; ++i) {
+ int maxLen = ( hex_len > hex_max_len) ? hex_max_len : hex_len;
- printf("%02X ", data[i]);
+ for (i = 0; i < maxLen; ++i, tmp += 2 + spaces_between) {
+ sprintf(tmp, (uppercase) ? "%02X" : "%02x", (unsigned int) hex_data[i]);
- // check if a line break is needed
- if ( breaks > 0 && !((i+1) % breaks) && (i+1 < len) ) {
- ++rownum;
- printf("\n[%02d] | ", rownum);
- }
+ for (int j = 0; j < spaces_between; j++)
+ sprintf(tmp + 2 + j, " ");
}
- printf("\n");
+
+ i *= (2 + spaces_between);
+ int minStrLen = min_str_len > i ? min_str_len : 0;
+ if (minStrLen > hex_max_len)
+ minStrLen = hex_max_len;
+ for(; i < minStrLen; i++, tmp += 1)
+ sprintf(tmp, " ");
+
+ return;
}
+// printing and converting functions
+
char *sprint_hex(const uint8_t *data, const size_t len) {
+ static char buf[4097] = {0};
- int maxLen = ( len > 1024/3) ? 1024/3 : len;
- static char buf[1024];
- memset(buf, 0x00, 1024);
- char *tmp = buf;
- size_t i;
+ hex_to_buffer((uint8_t *)buf, data, len, sizeof(buf) - 1, 0, 1, false);
- for (i=0; i < maxLen; ++i, tmp += 3)
- sprintf(tmp, "%02x ", (unsigned int) data[i]);
+ return buf;
+}
+
+char *sprint_hex_inrow_ex(const uint8_t *data, const size_t len, const size_t min_str_len) {
+ static char buf[4097] = {0};
+
+ hex_to_buffer((uint8_t *)buf, data, len, sizeof(buf) - 1, min_str_len, 0, false);
return buf;
}
+char *sprint_hex_inrow(const uint8_t *data, const size_t len) {
+ return sprint_hex_inrow_ex(data, len, 0);
+}
+
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;
@@ -169,12 +228,12 @@ char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t brea
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-1; out_index++) {
+ for (size_t out_index=0; out_index < max_len; out_index++) {
// set character - (should be binary but verify it isn't more than 1 digit)
if (data[in_index]<10)
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) ) {
+ if ( (breaks > 0) && !((in_index+1) % breaks) && (out_index+1 < max_len) ) {
// increment and print line break
out_index++;
sprintf(tmp++, "%s","\n");
@@ -189,38 +248,27 @@ 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) {
+char *sprint_ascii_ex(const uint8_t *data, const size_t len, const size_t min_str_len) {
static char buf[1024];
char *tmp = buf;
memset(buf, 0x00, 1024);
size_t max_len = (len > 1010) ? 1010 : len;
-
- 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);
+ tmp[i] = ((c < 32) || (c == 127)) ? '.' : c;
++i;
}
+
+ int minStrLen = min_str_len > i ? min_str_len : 0;
+ for(; i < minStrLen; ++i)
+ tmp[i] = ' ';
+
return buf;
}
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;
+ return sprint_ascii_ex(data, len, 0);
}
void num_to_bytes(uint64_t n, size_t len, uint8_t* dest)
@@ -274,32 +322,21 @@ uint32_t SwapBits(uint32_t value, int nrbits) {
uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockSize){
static 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)];
+ buf[i+(blockSize*block)] = src[(blockSize-1-i)+(blockSize*block)];
}
}
+ return buf;
}
//assumes little endian
-char * printBits(size_t const size, void const * const ptr)
+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;
+ char *tmp = buf;
int i, j;
for (i=size-1;i>=0;i--)
@@ -315,13 +352,30 @@ char * printBits(size_t const size, void const * const ptr)
return buf;
}
+char *printBitsPar(const uint8_t *b, size_t len) {
+ static char buf1[512] = {0};
+ static char buf2[512] = {0};
+ static char *buf;
+ if (buf != buf1)
+ buf = buf1;
+ else
+ buf = buf2;
+ memset(buf, 0x00, 512);
+
+ for (int i = 0; i < len; i++) {
+ buf[i] = ((b[i / 8] << (i % 8)) & 0x80) ? '1':'0';
+ }
+ return buf;
+}
+
+
// -------------------------------------------------------------------------
// string parameters lib
// -------------------------------------------------------------------------
// -------------------------------------------------------------------------
// line - param line
-// bg, en - symbol numbers in param line of beginning an ending parameter
+// bg, en - symbol numbers in param line of beginning and ending parameter
// paramnum - param number (from 0)
// -------------------------------------------------------------------------
int param_getptr(const char *line, int *bg, int *en, int paramnum)
@@ -354,13 +408,28 @@ int param_getptr(const char *line, int *bg, int *en, int paramnum)
}
-char param_getchar(const char *line, int paramnum)
+int param_getlength(const char *line, int paramnum)
{
int bg, en;
+ if (param_getptr(line, &bg, &en, paramnum)) return 0;
+
+ return en - bg + 1;
+}
+
+char param_getchar(const char *line, int paramnum) {
+ return param_getchar_indx(line, 0, paramnum);
+}
+
+char param_getchar_indx(const char *line, int indx, int paramnum) {
+ int bg, en;
+
if (param_getptr(line, &bg, &en, paramnum)) return 0x00;
- return line[bg];
+ if (bg + indx > en)
+ return '\0';
+
+ return line[bg + indx];
}
uint8_t param_get8(const char *line, int paramnum)
@@ -440,7 +509,7 @@ int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt)
return 1;
for(i = 0; i < hexcnt; i += 2) {
- if (!(isxdigit(line[bg + i]) && isxdigit(line[bg + i + 1])) ) return 1;
+ if (!(isxdigit((unsigned char)line[bg + i]) && isxdigit((unsigned char)line[bg + i + 1])) ) return 1;
sscanf((char[]){line[bg + i], line[bg + i + 1], 0}, "%X", &temp);
data[i / 2] = temp & 0xff;
@@ -448,7 +517,8 @@ 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 param_gethex_ex(const char *line, int paramnum, uint8_t *data, int *hexcnt)
{
int bg, en, temp, i;
@@ -457,12 +527,14 @@ int param_gethex_ex(const char *line, int paramnum, uint8_t * data, int *hexcnt)
if (param_getptr(line, &bg, &en, paramnum)) return 1;
+ if (en - bg + 1 > *hexcnt) 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;
+ if (!(isxdigit((unsigned char)line[bg + i]) && isxdigit((unsigned char)line[bg + i + 1])) ) return 1;
sscanf((char[]){line[bg + i], line[bg + i + 1], 0}, "%X", &temp);
data[i / 2] = temp & 0xff;
@@ -470,11 +542,66 @@ int param_gethex_ex(const char *line, int paramnum, uint8_t * data, int *hexcnt)
return 0;
}
-int param_getstr(const char *line, int paramnum, char * str)
+
+int param_gethex_to_eol(const char *line, int paramnum, uint8_t * data, int maxdatalen, int *datalen) {
+ int bg, en;
+ uint32_t temp;
+ char buf[5] = {0};
+
+ if (param_getptr(line, &bg, &en, paramnum)) return 1;
+
+ *datalen = 0;
+
+ int indx = bg;
+ while (line[indx]) {
+ if (line[indx] == '\t' || line[indx] == ' ') {
+ indx++;
+ continue;
+ }
+
+ if (isxdigit((unsigned char)line[indx])) {
+ buf[strlen(buf) + 1] = 0x00;
+ buf[strlen(buf)] = line[indx];
+ } else {
+ // if we have symbols other than spaces and hex
+ return 1;
+ }
+
+ if (*datalen >= maxdatalen) {
+ // if we dont have space in buffer and have symbols to translate
+ return 2;
+ }
+
+ if (strlen(buf) >= 2) {
+ sscanf(buf, "%x", &temp);
+ data[*datalen] = (uint8_t)(temp & 0xff);
+ *buf = 0;
+ (*datalen)++;
+ }
+
+ indx++;
+ }
+
+ if (strlen(buf) > 0)
+ //error when not completed hex bytes
+ return 3;
+
+ return 0;
+}
+
+int param_getstr(const char *line, int paramnum, char * str, size_t buffersize)
{
int bg, en;
- if (param_getptr(line, &bg, &en, paramnum)) return 0;
+ if (param_getptr(line, &bg, &en, paramnum)) {
+ return 0;
+ }
+
+ // Prevent out of bounds errors
+ if (en - bg + 1 >= buffersize) {
+ printf("out of bounds error: want %d bytes have %zd bytes\n", en - bg + 1 + 1, buffersize);
+ return 0;
+ }
memcpy(str, line + bg, en - bg + 1);
str[en - bg + 1] = 0;
@@ -492,6 +619,7 @@ https://github.com/ApertureLabsLtd/RFIDler/blob/master/firmware/Pic32/RFIDler.X/
int hextobinarray(char *target, char *source)
{
int length, i, count= 0;
+ char* start = source;
char x;
length = strlen(source);
@@ -507,8 +635,10 @@ int hextobinarray(char *target, char *source)
x -= '0';
else if (x >= 'A' && x <= 'F')
x -= 'A' - 10;
- else
+ else {
+ printf("Discovered unknown character %c %d at idx %tu of %s\n", x, x, source - start, start);
return 0;
+ }
// output
for(i= 0 ; i < 4 ; ++i, ++count)
*(target++)= (x >> (3 - i)) & 1;
@@ -517,17 +647,6 @@ int hextobinarray(char *target, char *source)
return count;
}
-// convert hex to human readable binary string
-int hextobinstring(char *target, char *source)
-{
- int length;
-
- if(!(length= hextobinarray(target, source)))
- return 0;
- binarraytobinstring(target, target, length);
- return length;
-}
-
// convert binary array of 0x00/0x01 values to hex (safe to do in place as target will always be shorter than source)
// return number of bits converted
int binarraytohex(char *target,char *source, int length)
@@ -550,16 +669,6 @@ int binarraytohex(char *target,char *source, int length)
return length;
}
-// convert binary array to human readable binary
-void binarraytobinstring(char *target, char *source, int length)
-{
- int i;
-
- for(i= 0 ; i < length ; ++i)
- *(target++)= *(source++) + '0';
- *target= '\0';
-}
-
// return parity bit required to match type
uint8_t GetParity( uint8_t *bits, uint8_t type, int length)
{
@@ -587,13 +696,6 @@ void xor(unsigned char *dst, unsigned char *src, size_t len) {
*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]);
-}
-
// RotateLeft - Ultralight, Desfire, works on byte level
// 00-01-02 >> 01-02-00
void rol(uint8_t *data, const size_t len){
@@ -613,37 +715,43 @@ void clean_ascii(unsigned char *buf, size_t len) {
}
}
+// replace \r \n to \0
+void strcleanrn(char *buf, size_t len) {
+ strcreplace(buf, len, '\n', '\0');
+ strcreplace(buf, len, '\r', '\0');
+}
-// Timer functions
-#if !defined (_WIN32)
-#include <errno.h>
-
-static void nsleep(uint64_t n) {
- struct timespec timeout;
- timeout.tv_sec = n/1000000000;
- timeout.tv_nsec = n%1000000000;
- while (nanosleep(&timeout, &timeout) && errno == EINTR);
+// replace char in buffer
+void strcreplace(char *buf, size_t len, char from, char to) {
+ for (size_t i = 0; i < len; i++) {
+ if (buf[i] == from)
+ buf[i] = to;
+ }
}
-void msleep(uint32_t n) {
- nsleep(1000000 * n);
+char *strmcopy(char *buf) {
+ char * str = NULL;
+ if ((str = (char*) malloc(strlen(buf) + 1)) != NULL) {
+ memset(str, 0, strlen(buf) + 1);
+ strcpy(str, buf);
+ }
+ return str;
}
-#endif // _WIN32
-// a milliseconds timer for performance measurement
-uint64_t msclock() {
+// determine number of logical CPU cores (use for multithreaded functions)
+extern int num_CPUs(void)
+{
#if defined(_WIN32)
-#include <sys/types.h>
- struct _timeb t;
- if (_ftime_s(&t)) {
- return 0;
- } else {
- return 1000 * t.time + t.millitm;
- }
+ #include <sysinfoapi.h>
+ SYSTEM_INFO sysinfo;
+ GetSystemInfo(&sysinfo);
+ return sysinfo.dwNumberOfProcessors;
+#elif defined(__linux__) || defined(__APPLE__)
+ #include <unistd.h>
+ return sysconf(_SC_NPROCESSORS_ONLN);
#else
- struct timespec t;
- clock_gettime(CLOCK_MONOTONIC, &t);
- return (t.tv_sec * 1000 + t.tv_nsec / 1000000);
+ return 1;
#endif
}
+