X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/713045f81987cf7ac746561b09e607028204bb6c..4419118038bd43425be73c0bbcf9c50363b96d99:/client/util.h?ds=sidebyside diff --git a/client/util.h b/client/util.h index c206fb0a..640ef434 100644 --- a/client/util.h +++ b/client/util.h @@ -8,13 +8,11 @@ // utilities //----------------------------------------------------------------------------- -#include -#include //included in data.h -#include -#include -#include -#include //time, gmtime -#include "data.h" //for FILE_PATH_SIZE +#ifndef UTIL_H__ +#define UTIL_H__ + +#include +#include #ifndef ROTR # define ROTR(x,n) (((uintmax_t)(x) >> (n)) | ((uintmax_t)(x) << ((sizeof(x) * 8) - (n)))) @@ -25,55 +23,60 @@ #ifndef MAX # define MAX(a, b) (((a) > (b)) ? (a) : (b)) #endif + #define EVEN 0 #define ODD 1 -int ukbhit(void); +extern int ukbhit(void); + +extern void AddLogLine(char *fileName, char *extData, char *c); +extern void AddLogHex(char *fileName, char *extData, const uint8_t * data, const size_t len); +extern void AddLogUint64(char *fileName, char *extData, const uint64_t data); +extern void AddLogCurrentDT(char *fileName); +extern void FillFileNameByUID(char *fileName, uint8_t * uid, char *ext, int byteCount); + +extern void print_hex(const uint8_t * data, const size_t len); +extern char *sprint_hex(const uint8_t * data, const size_t len); +extern char *sprint_bin(const uint8_t * data, const size_t len); +extern char *sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t breaks); +extern char *sprint_hex_ascii(const uint8_t *data, const size_t len); +extern char *sprint_ascii(const uint8_t *data, const size_t len); -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, int byteCount); +extern void num_to_bytes(uint64_t n, size_t len, uint8_t* dest); +extern uint64_t bytes_to_num(uint8_t* src, size_t len); +extern void num_to_bytebits(uint64_t n, size_t len, uint8_t *dest); +extern void num_to_bytebitsLSBF(uint64_t n, size_t len, uint8_t *dest); +extern char *printBits(size_t const size, void const * const ptr); +extern uint32_t SwapBits(uint32_t value, int nrbits); +extern uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockSize); +extern void SwapEndian64ex(const uint8_t *src, const size_t len, const uint8_t blockSize, uint8_t *dest); -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); -char * sprint_hex_ascii(const uint8_t *data, const size_t len); -char * sprint_ascii(const uint8_t *data, const size_t len); +extern char param_getchar(const char *line, int paramnum); +extern int param_getptr(const char *line, int *bg, int *en, int paramnum); +extern uint8_t param_get8(const char *line, int paramnum); +extern uint8_t param_get8ex(const char *line, int paramnum, int deflt, int base); +extern uint32_t param_get32ex(const char *line, int paramnum, int deflt, int base); +extern uint64_t param_get64ex(const char *line, int paramnum, int deflt, int base); +extern uint8_t param_getdec(const char *line, int paramnum, uint8_t *destination); +extern uint8_t param_isdec(const char *line, int paramnum); +extern int param_gethex(const char *line, int paramnum, uint8_t * data, int hexcnt); +extern int param_gethex_ex(const char *line, int paramnum, uint8_t * data, int *hexcnt); +extern int param_getstr(const char *line, int paramnum, char * str); -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); -void num_to_bytebitsLSBF(uint64_t n, size_t len, uint8_t *dest); -char * printBits(size_t const size, void const * const ptr); -uint32_t SwapBits(uint32_t value, int nrbits); -uint8_t *SwapEndian64(const uint8_t *src, const size_t len, const uint8_t blockSize); -void SwapEndian64ex(const uint8_t *src, const size_t len, const uint8_t blockSize, uint8_t *dest); +extern int hextobinarray( char *target, char *source); +extern int hextobinstring( char *target, char *source); +extern int binarraytohex( char *target, char *source, int length); +extern void binarraytobinstring(char *target, char *source, int length); +extern uint8_t GetParity( uint8_t *string, uint8_t type, int length); +extern void wiegand_add_parity(uint8_t *target, uint8_t *source, uint8_t length); -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_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_ex(const char *line, int paramnum, uint8_t * data, int *hexcnt); -int param_getstr(const char *line, int paramnum, char * str); +extern void xor(unsigned char *dst, unsigned char *src, size_t len); +extern int32_t le24toh(uint8_t data[3]); +extern uint32_t le32toh (uint8_t *data); +extern void rol(uint8_t *data, const size_t len); - 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); -uint8_t GetParity( uint8_t *string, uint8_t type, int length); -void wiegand_add_parity(uint8_t *target, uint8_t *source, uint8_t length); +extern void clean_ascii(unsigned char *buf, size_t len); -void xor(unsigned char *dst, unsigned char *src, size_t len); -int32_t le24toh(uint8_t data[3]); -uint32_t le32toh (uint8_t *data); -void rol(uint8_t *data, const size_t len); +extern int num_CPUs(void); // number of logical CPUs -void clean_ascii(unsigned char *buf, size_t len); +#endif // UTIL_H__