Create session key

[proxmark3-svn] / client / util.h

diff --git a/client/util.h b/client/util.h
index cec187cf23db1bebe911cede313da860aa137192..2677ab84589c39cf73f305ec292d33eecf2b423f 100644 (file)
--- a/client/util.h
+++ b/client/util.h
@@ -16,19 +16,28 @@
 #include <ctype.h>
 #include <time.h>
 
 #include <ctype.h>
 #include <time.h>
 

+#ifndef MIN
+# define MIN(a, b) (((a) < (b)) ? (a) : (b))
+#endif
+#ifndef MAX
+# define MAX(a, b) (((a) > (b)) ? (a) : (b))
+#endif
+

 int ukbhit(void);
 
 void AddLogLine(char *fileName, char *extData, char *c);
 void AddLogHex(char *fileName, char *extData, const uint8_t * data, const size_t len);
 void AddLogUint64(char *fileName, char *extData, const uint64_t data);
 void AddLogCurrentDT(char *fileName);
 int ukbhit(void);
 
 void AddLogLine(char *fileName, char *extData, char *c);
 void AddLogHex(char *fileName, char *extData, const uint8_t * data, const size_t len);
 void AddLogUint64(char *fileName, char *extData, const uint64_t data);
 void AddLogCurrentDT(char *fileName);

-void FillFileNameByUID(char *fileName, uint8_t * uid, char *ext);
+void FillFileNameByUID(char *fileName, uint8_t * uid, char *ext, int byteCount);

 
 void print_hex(const uint8_t * data, const size_t len);
 char * sprint_hex(const uint8_t * data, const size_t len);
 
 void print_hex(const uint8_t * data, const size_t len);
 char * sprint_hex(const uint8_t * data, const size_t len);

+char * sprint_bin(const uint8_t * data, const size_t len);

 
 void num_to_bytes(uint64_t n, size_t len, uint8_t* dest);
 uint64_t bytes_to_num(uint8_t* src, size_t len);
 
 void num_to_bytes(uint64_t n, size_t len, uint8_t* dest);
 uint64_t bytes_to_num(uint8_t* src, size_t len);

+char * printBits(size_t const size, void const * const ptr);

 
 char param_getchar(const char *line, int paramnum);
 uint8_t param_get8(const char *line, int paramnum);
 
 char param_getchar(const char *line, int paramnum);
 uint8_t param_get8(const char *line, int paramnum);


@@ -38,3 +47,4 @@ uint64_t param_get64ex(const char *line, int paramnum, int deflt, int base);
 int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt);
 int param_getstr(const char *line, int paramnum, char * str);
 
 int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt);
 int param_getstr(const char *line, int paramnum, char * str);
 

+