X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/c19f26b05dc5dcf8ddf6a8f920f05823327895b0..27d06e044795c0b0ea4d34b10bccfa41d57f77fc:/client/util.c
diff --git a/client/util.c b/client/util.c
index 86e8c502..423d14a0 100644
--- a/client/util.c
+++ b/client/util.c
@@ -16,7 +16,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <time.h>
-#include "data.h"
+#include <stdarg.h>
#ifdef _WIN32
#include <windows.h>
@@ -111,49 +111,83 @@ void FillFileNameByUID(char *fileName, uint8_t * uid, char *ext, int byteCount)
sprintf(fnameptr, "%s", ext);
}
-// printing and converting functions
-
-void print_hex(const uint8_t * data, const size_t len)
-{
- size_t i;
-
- for (i=0; i < len; i++)
- printf("%02x ", data[i]);
+// 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);
- printf("\n");
+ return 0;
}
-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);
+
+ return buf;
+}
- for (i=0; i < maxLen; ++i, tmp += 3)
- sprintf(tmp, "%02x ", (unsigned int) data[i]);
+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;
@@ -189,28 +223,7 @@ 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 > 255) ? 255 : len;
- // max 255 bytes * 3 + 2 characters = 767 in buffer
- sprintf(tmp, "%s| ", sprint_hex(data, max_len) );
-
- size_t i = 0;
- size_t pos = (max_len * 3)+2;
- // add another 255 characters ascii = 1020 characters of buffer used
- while(i < max_len) {
- char c = data[i];
- if ( (c < 32) || (c == 127))
- c = '.';
- sprintf(tmp+pos+i, "%c", c);
- ++i;
- }
- return buf;
-}
-
-char *sprint_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);
@@ -221,6 +234,11 @@ char *sprint_ascii(const uint8_t *data, const size_t len) {
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;
}
@@ -284,16 +302,6 @@ 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)];
- }
- }
-}
-
//assumes little endian
char * printBits(size_t const size, void const * const ptr)
{
@@ -316,6 +324,23 @@ 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
// -------------------------------------------------------------------------
@@ -364,13 +389,19 @@ int param_getlength(const char *line, int paramnum)
return en - bg + 1;
}
-char param_getchar(const char *line, int paramnum)
-{
+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)
@@ -450,7 +481,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;
@@ -472,7 +503,7 @@ int param_gethex_ex(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;
@@ -480,11 +511,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;
@@ -502,6 +588,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);
@@ -517,8 +604,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;
@@ -527,17 +616,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)
@@ -560,16 +638,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)
{
@@ -597,13 +665,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){
@@ -623,7 +684,28 @@ 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');
+}
+
+// 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;
+ }
+}
+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;
+}
// determine number of logical CPU cores (use for multithreaded functions)