projects
/
proxmark3-svn
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FIX: minor fixes to the HID wiegand generation command. Still not complete
[proxmark3-svn]
/
client
/
util.h
diff --git
a/client/util.h
b/client/util.h
index a6d0f49f206db2483dd656b8f431689917e0c2c7..39ed51b4c9a4f53dd012804d3bd091c205503015 100644
(file)
--- a/
client/util.h
+++ b/
client/util.h
@@
-17,12
+17,20
@@
#include <time.h>
#include "data.h"
#include <time.h>
#include "data.h"
+#ifndef ROTR
+# define ROTR(x,n) (((uintmax_t)(x) >> (n)) | ((uintmax_t)(x) << ((sizeof(x) * 8) - (n))))
+#endif
#ifndef MIN
# define MIN(a, b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a, b) (((a) > (b)) ? (a) : (b))
#endif
#ifndef MIN
# define MIN(a, b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef MAX
# define MAX(a, b) (((a) > (b)) ? (a) : (b))
#endif
+#ifndef BSWAP_32
+#define BSWAP_32(x) \
+ ((((x) & 0xff000000) >> 24) | (((x) & 0x00ff0000) >> 8) | \
+ (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
+#endif
#define TRUE 1
#define FALSE 0
#define EVEN 0
#define TRUE 1
#define FALSE 0
#define EVEN 0
@@
-37,15
+45,19
@@
void AddLogCurrentDT(char *fileName);
void FillFileNameByUID(char *fileName, uint8_t * uid, char *ext, int byteCount);
void print_hex(const uint8_t * data, const size_t len);
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);
-char * sprint_bin_break(const uint8_t *data, const size_t len, const uint8_t breaks);
+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);
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);
+void num_to_bytebits(uint64_t n, size_t len, uint8_t *dest);
+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);
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);
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);
@@
-53,12
+65,17
@@
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);
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);
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
Impressum
,
Datenschutz