#include <stdlib.h>
#include <stdio.h>
#include <time.h>
-#include "data.h"
#ifdef _WIN32
#include <windows.h>
sprintf(fnameptr, "%s", ext);
}
-// printing and converting functions
-
-void print_hex(const uint8_t * data, const size_t len)
-{
+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);
- 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) {
+ 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[1025] = {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[1025] = {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;
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);
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;
}
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)
{
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
// -------------------------------------------------------------------------
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;
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;
int indx = bg;
while (line[indx]) {
- if (line[indx] == '\t' || line[indx] == ' ')
+ if (line[indx] == '\t' || line[indx] == ' ') {
+ indx++;
continue;
+ }
- if (isxdigit(line[indx])) {
+ if (isxdigit((unsigned char)line[indx])) {
buf[strlen(buf) + 1] = 0x00;
buf[strlen(buf)] = line[indx];
} else {
// Prevent out of bounds errors
if (en - bg + 1 >= buffersize) {
- printf("out of bounds error: want %lu bytes have %lu bytes\n", en - bg + 1 + 1, buffersize);
+ printf("out of bounds error: want %d bytes have %zd bytes\n", en - bg + 1 + 1, buffersize);
return 0;
}
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
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)
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)
{
*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){
projects / proxmark3-svn / blobdiff