X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/653e5ed3ca3f8bf4ae677900ae4860a8cf7026c1..b6851c194edcb16ef0ec3c13038216cabb6a46e0:/client/util.c?ds=sidebyside
diff --git a/client/util.c b/client/util.c
index 92b0e7a6..f13d730c 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>
@@ -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) {
@@ -111,63 +126,86 @@ void FillFileNameByUID(char *fileName, uint8_t * uid, char *ext, int byteCount)
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;
-
- for (i=0; i < maxLen; ++i, tmp += 3)
- sprintf(tmp, "%02x ", (unsigned int) data[i]);
+ hex_to_buffer((uint8_t *)buf, data, len, sizeof(buf) - 1, 0, 1, false);
return buf;
}
char *sprint_hex_inrow_ex(const uint8_t *data, const size_t len, const size_t min_str_len) {
-
- int maxLen = ( len > 1024/2) ? 1024/2 : len;
- static char buf[1024] = {0};
- char *tmp = buf;
- size_t i;
+ static char buf[4097] = {0};
- for (i = 0; i < maxLen; ++i, tmp += 2)
- sprintf(tmp, "%02x", (unsigned int) data[i]);
-
- i *= 2;
- int minStrLen = min_str_len > i ? min_str_len : 0;
- for(; i < minStrLen; i++, tmp += 1)
- sprintf(tmp, " ");
+ hex_to_buffer((uint8_t *)buf, data, len, sizeof(buf) - 1, min_str_len, 0, false);
return buf;
}
@@ -211,27 +249,6 @@ 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_ex(const uint8_t *data, const size_t len, const size_t min_str_len) {
static char buf[1024];
char *tmp = buf;
@@ -251,10 +268,6 @@ char *sprint_ascii_ex(const uint8_t *data, const size_t len, const size_t min_st
return buf;
}
-char *sprint_ascii(const uint8_t *data, const size_t len) {
- return sprint_ascii_ex(data, len, 0);
-}
-
void num_to_bytes(uint64_t n, size_t len, uint8_t* dest)
{
while (len--) {
@@ -315,16 +328,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)
{
@@ -347,6 +350,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
// -------------------------------------------------------------------------
@@ -487,7 +507,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;
@@ -509,7 +529,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;
@@ -534,7 +554,7 @@ int param_gethex_to_eol(const char *line, int paramnum, uint8_t * data, int maxd
continue;
}
- if (isxdigit(line[indx])) {
+ if (isxdigit((unsigned char)line[indx])) {
buf[strlen(buf) + 1] = 0x00;
buf[strlen(buf)] = line[indx];
} else {
@@ -611,7 +631,7 @@ int hextobinarray(char *target, char *source)
else if (x >= 'A' && x <= 'F')
x -= 'A' - 10;
else {
- printf("Discovered unknown character %c %d at idx %d of %s\n", x, x, source - start, start);
+ printf("Discovered unknown character %c %d at idx %tu of %s\n", x, x, source - start, start);
return 0;
}
// output
@@ -622,17 +642,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)
@@ -655,16 +664,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)
{
@@ -692,13 +691,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){