added some keys

[proxmark3-svn] / client / util.h

diff --git a/client/util.h b/client/util.h
index 22d41e0c8f3b8807c13dd918b15adfe07494a97a..5ba5eb6aa42a19f33ea0a802d1bf80899a47a749 100644 (file)
--- a/client/util.h
+++ b/client/util.h
@@ -39,23 +39,34 @@ 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);
 char * sprint_bin(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);

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

 
 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);

+void num_to_bytebits(uint64_t  n, size_t len, uint8_t *dest);

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

+uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockSize);

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

+int param_getptr(const char *line, int *bg, int *en, int paramnum);

 uint8_t param_get8(const char *line, int paramnum);
 uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base);
 uint32_t param_get32ex(const char *line, int paramnum, int deflt, int base);
 uint64_t param_get64ex(const char *line, int paramnum, int deflt, int base);
 uint8_t param_get8(const char *line, int paramnum);
 uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base);
 uint32_t param_get32ex(const char *line, int paramnum, int deflt, int base);
 uint64_t param_get64ex(const char *line, int paramnum, int deflt, int base);

+uint8_t param_getdec(const char *line, int paramnum, uint8_t *destination);
+uint8_t param_isdec(const char *line, int paramnum);

 int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt);
 int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt);

+int param_gethex_ex(const char *line, int paramnum, uint8_t * data, int *hexcnt);

 int param_getstr(const char *line, int paramnum, char * str);
 
 int param_getstr(const char *line, int paramnum, char * str);
 

- int hextobinarray( char *target,  char *source);
- int hextobinstring( char *target,  char *source);
- int binarraytohex( char *target,  char *source,  int length);
+int hextobinarray( char *target,  char *source);
+int hextobinstring( char *target,  char *source);
+int binarraytohex( char *target,  char *source,  int length);

 void binarraytobinstring(char *target,  char *source,  int length);
 void binarraytobinstring(char *target,  char *source,  int length);

-uint8_t GetParity( char *string, uint8_t type,  int length);
-void wiegand_add_parity(char *target, char *source, char length);
+uint8_t GetParity( uint8_t *string, uint8_t type,  int length);
+void wiegand_add_parity(uint8_t *target, uint8_t *source, uint8_t length);

 
 

+void xor(unsigned char * dst, unsigned char * src, size_t len);
+int32_t le24toh (uint8_t data[3]);
+uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits);
+void rol(uint8_t *data, const size_t len);
\ No newline at end of file