CHG: the mifare Auth command can make use of a random nonce aswell.

[proxmark3-svn] / client / util.h

diff --git a/client/util.h b/client/util.h
index de1fa095d03f5301dd37ee5eadea58e315c3cfa2..593c9af7f7207effa056227b9a847f10d295a07b 100644 (file)
--- a/client/util.h
+++ b/client/util.h
@@ -7,6 +7,8 @@
 //-----------------------------------------------------------------------------
 // utilities
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // utilities
 //-----------------------------------------------------------------------------

+#ifndef __UTIL_H_
+#define __UTIL_H_

 
 #include <stdio.h>
 #include <stdint.h>            //included in data.h
 
 #include <stdio.h>
 #include <stdint.h>            //included in data.h


@@ -14,9 +16,11 @@
 #include <string.h>
 #include <ctype.h>
 #include <math.h>              // math.pow
 #include <string.h>
 #include <ctype.h>
 #include <math.h>              // math.pow

+#include <time.h>       // time, gmtime

 #include "proxmark3.h" // time_t
 #include "data.h"              // for FILE_PATH_SIZE
 
 #include "proxmark3.h" // time_t
 #include "data.h"              // for FILE_PATH_SIZE
 

+#include <time.h>

 // Handle platform specific includes
 #ifndef _WIN32
   #include <termios.h>
 // Handle platform specific includes
 #ifndef _WIN32
   #include <termios.h>


@@ -24,7 +28,6 @@
   #include <sys/time.h>
 #else
   #include <conio.h>
   #include <sys/time.h>
 #else
   #include <conio.h>

-  #include <time.h>

   #include <windows.h>
 #endif
 
   #include <windows.h>
 #endif
 


@@ -104,6 +107,7 @@ 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_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);

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


@@ -138,4 +142,6 @@ uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits);
 void rol(uint8_t *data, const size_t len);
 uint32_t SwapBits(uint32_t value, int nrbits);
 uint32_t reflect(uint32_t v, int b);
 void rol(uint8_t *data, const size_t len);
 uint32_t SwapBits(uint32_t value, int nrbits);
 uint32_t reflect(uint32_t v, int b);

-uint64_t HornerScheme(uint64_t num, uint64_t divider, uint64_t factor);
\ No newline at end of file
+uint64_t HornerScheme(uint64_t num, uint64_t divider, uint64_t factor);
+
+#endif
\ No newline at end of file