projects
/
proxmark3-svn
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CHG: "hf 14b sim" making the flow to be similar to "hf 14a sim".
[proxmark3-svn]
/
client
/
util.c
diff --git
a/client/util.c
b/client/util.c
index de6443cfcd7ab48a3c927c91b6f884f32ad3171d..99a26a40ac20160a688139d9a86f59b37a5f4c09 100644
(file)
--- a/
client/util.c
+++ b/
client/util.c
@@
-9,6
+9,7
@@
//-----------------------------------------------------------------------------
#include "util.h"
//-----------------------------------------------------------------------------
#include "util.h"
+#include "proxmark3.h"
#define MAX_BIN_BREAK_LENGTH (3072+384+1)
#ifndef _WIN32
#define MAX_BIN_BREAK_LENGTH (3072+384+1)
#ifndef _WIN32
@@
-21,14
+22,14
@@
int ukbhit(void)
int error;
static struct termios Otty, Ntty;
int error;
static struct termios Otty, Ntty;
-
tcgetattr( 0, &Otty)
;
+
if ( tcgetattr( 0, &Otty) == -1) return -1
;
Ntty = Otty;
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);
if (0 == (error = tcsetattr(0, TCSANOW, &Ntty))) {
error += ioctl(0, FIONREAD, &cnt);
@@
-47,7
+48,7
@@
int ukbhit(void) {
// log files functions
void AddLogLine(char *file, char *extData, char *c) {
// log files functions
void AddLogLine(char *file, char *extData, char *c) {
- FILE *f
Log
= NULL;
+ FILE *f = NULL;
char filename[FILE_PATH_SIZE] = {0x00};
int len = 0;
char filename[FILE_PATH_SIZE] = {0x00};
int len = 0;
@@
-55,15
+56,16
@@
void AddLogLine(char *file, char *extData, char *c) {
if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
memcpy(filename, file, len);
if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
memcpy(filename, file, len);
- f
Log
= fopen(filename, "a");
- if (!f
Log
) {
+ f = fopen(filename, "a");
+ if (!f) {
printf("Could not append log file %s", filename);
return;
}
printf("Could not append log file %s", filename);
return;
}
- fprintf(fLog, "%s", extData);
- fprintf(fLog, "%s\n", c);
- fclose(fLog);
+ fprintf(f, "%s", extData);
+ fprintf(f, "%s\n", c);
+ fflush(f);
+ fclose(f);
}
void AddLogHex(char *fileName, char *extData, const uint8_t * data, const size_t len){
}
void AddLogHex(char *fileName, char *extData, const uint8_t * data, const size_t len){
@@
-71,40
+73,58
@@
void AddLogHex(char *fileName, char *extData, const uint8_t * data, const size_t
}
void AddLogUint64(char *fileName, char *extData, const uint64_t data) {
}
void AddLogUint64(char *fileName, char *extData, const uint64_t data) {
- char buf[100] = {0};
- sprintf(buf, "%x%x", (unsigned int)((data & 0xFFFFFFFF00000000) >> 32), (unsigned int)(data & 0xFFFFFFFF));
+ char buf[20] = {0};
+ memset(buf, 0x00, sizeof(buf));
+ //sprintf(buf, "%X%X", (unsigned int)((data & 0xFFFFFFFF00000000) >> 32), (unsigned int)(data & 0xFFFFFFFF));
+ sprintf(buf, "%012"llx"", data);
AddLogLine(fileName, extData, buf);
}
void AddLogCurrentDT(char *fileName) {
AddLogLine(fileName, extData, buf);
}
void AddLogCurrentDT(char *fileName) {
- char buff[20];
+ char buf[20];
+ memset(buf, 0x00, sizeof(buf));
struct tm *curTime;
struct tm *curTime;
-
time_t now = time(0);
curTime = gmtime(&now);
time_t now = time(0);
curTime = gmtime(&now);
-
- strftime (buff, sizeof(buff), "%Y-%m-%d %H:%M:%S", curTime);
- AddLogLine(fileName, "\nanticollision: ", buff);
+ strftime (buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", curTime);
+ AddLogLine(fileName, "\nanticollision: ", buf);
}
}
-void FillFileNameByUID(char *fileName, uint8_t * uid, char *ext, int byteCount) {
+void FillFileNameByUID(char *fileName, uint8_t *uid, char *ext, int byteCount) {
+ if ( fileName == NULL || uid == NULL || ext == NULL ){
+ printf("error: parameter is NULL\n");
+ return;
+ }
char * fnameptr = fileName;
char * fnameptr = fileName;
- memset(fileName, 0x00,
200
);
+ memset(fileName, 0x00,
FILE_PATH_SIZE
);
for (int j = 0; j < byteCount; j++, fnameptr += 2)
for (int j = 0; j < byteCount; j++, fnameptr += 2)
- sprintf(fnameptr, "%02
x
", uid[j]);
+ sprintf(fnameptr, "%02
X
", uid[j]);
sprintf(fnameptr, "%s", ext);
}
// printing and converting functions
sprintf(fnameptr, "%s", ext);
}
// 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;
size_t i;
-
- for (i=0; i < len; i++)
+ for (i=0; i < len; ++i)
printf("%02x ", data[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");
}
printf("\n");
}
@@
-118,13
+138,14
@@
char *sprint_hex(const uint8_t *data, const size_t len) {
for (i=0; i < maxLen; ++i, tmp += 3)
sprintf(tmp, "%02X ", data[i]);
for (i=0; i < maxLen; ++i, tmp += 3)
sprintf(tmp, "%02X ", data[i]);
-
return buf;
}
char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t breaks) {
return buf;
}
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
// 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
if (breaks==0)
max_len = ( len > MAX_BIN_BREAK_LENGTH ) ? MAX_BIN_BREAK_LENGTH : len;
else
@@
-135,20
+156,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;
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
// loop through the out_index to make sure we don't go too far
- for (
size_t
out_index=0; out_index < max_len-2; out_index++) {
+ for (out_index=0; out_index < max_len-2; out_index++) {
// set character
// 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");
// 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++;
}
in_index++;
}
-
+ // last char.
+ sprintf(tmp++, "%u", (unsigned int) data[in_index]);
return buf;
}
return buf;
}
@@
-158,11
+179,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];
char *sprint_hex_ascii(const uint8_t *data, const size_t len) {
static char buf[1024];
- memset(buf, 0x00, 1024);
char *tmp = buf;
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;
}
return buf;
}
+
void num_to_bytes(uint64_t n, size_t len, uint8_t* dest)
{
while (len--) {
void num_to_bytes(uint64_t n, size_t len, uint8_t* dest)
{
while (len--) {
@@
-182,12
+205,21
@@
uint64_t bytes_to_num(uint8_t* src, size_t len)
return num;
}
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;
}
}
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
// aa,bb,cc,dd,ee,ff,gg,hh, ii,jj,kk,ll,mm,nn,oo,pp
// to
@@
-205,6
+237,8
@@
uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockS
return tmp;
}
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++){
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++){
@@
-213,7
+247,6
@@
void SwapEndian64ex(const uint8_t *src, const size_t len, const uint8_t blockSiz
}
}
}
}
-
// -------------------------------------------------------------------------
// string parameters lib
// -------------------------------------------------------------------------
// -------------------------------------------------------------------------
// string parameters lib
// -------------------------------------------------------------------------
@@
-478,6
+511,7
@@
void wiegand_add_parity(uint8_t *target, uint8_t *source, uint8_t length)
*(target)= GetParity(source + length / 2, ODD, length / 2);
}
*(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;
void xor(unsigned char * dst, unsigned char * src, size_t len) {
for( ; len > 0; len--,dst++,src++)
*dst ^= *src;
@@
-486,7
+520,10
@@
void xor(unsigned char * dst, unsigned char * src, size_t len) {
int32_t le24toh (uint8_t data[3]) {
return (data[2] << 16) | (data[1] << 8) | data[0];
}
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]);
+}
+// Pack a bitarray into a uint32_t.
uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits) {
if (len > 32) return 0;
uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits) {
if (len > 32) return 0;
@@
-503,10
+540,19
@@
uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits) {
// RotateLeft - Ultralight, Desfire, works on byte level
// 00-01-02 >> 01-02-00
// RotateLeft - Ultralight, Desfire, works on byte level
// 00-01-02 >> 01-02-00
-void rol(uint8_t *data, const size_t len){
+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;
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
}
\ No newline at end of file
Impressum
,
Datenschutz