fix: crapto3.3 sometimes crashing with hf mf mifare on Fudan clones (no par, all...

[proxmark3-svn] / client / util.c

diff --git a/client/util.c b/client/util.c
index e80f5cc9d59efeb7fe1cabee909db4bcb49ed1d5..81b2d844f4376bdda269f6e3850a5c9925915216 100644 (file)
--- a/client/util.c
+++ b/client/util.c
@@ -8,15 +8,26 @@
 // utilities
 //-----------------------------------------------------------------------------
 
 // utilities
 //-----------------------------------------------------------------------------
 

-#include <ctype.h>
+#if !defined(_WIN32)
+#define _POSIX_C_SOURCE        199309L                 // need nanosleep()
+#endif
+

 #include "util.h"
 #include "util.h"

+
+#include <stdint.h>
+#include <string.h>
+#include <ctype.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <time.h>
+#include "data.h"
+

 #define MAX_BIN_BREAK_LENGTH   (3072+384+1)
 
 #ifndef _WIN32
 #include <termios.h>
 #include <sys/ioctl.h> 
 
 #define MAX_BIN_BREAK_LENGTH   (3072+384+1)
 
 #ifndef _WIN32
 #include <termios.h>
 #include <sys/ioctl.h> 
 

-

 int ukbhit(void)
 {
   int cnt = 0;
 int ukbhit(void)
 {
   int cnt = 0;


@@ -42,6 +53,7 @@ int ukbhit(void)
 }
 
 #else
 }
 
 #else

+

 #include <conio.h>
 int ukbhit(void) {
        return kbhit();
 #include <conio.h>
 int ukbhit(void) {
        return kbhit();


@@ -591,3 +603,38 @@ void clean_ascii(unsigned char *buf, size_t len) {
       buf[i] = '.';
   }
 }
       buf[i] = '.';
   }
 }

+
+
+// Timer functions
+#if !defined (_WIN32)
+#include <errno.h>
+
+static void nsleep(uint64_t n) {
+  struct timespec timeout;
+  timeout.tv_sec = n/1000000000;
+  timeout.tv_nsec = n%1000000000;
+  while (nanosleep(&timeout, &timeout) && errno == EINTR);
+}
+
+void msleep(uint32_t n) {
+       nsleep(1000000 * n);
+}
+
+#endif // _WIN32
+
+// a milliseconds timer for performance measurement
+uint64_t msclock() {
+#if defined(_WIN32)
+#include <sys/types.h>
+       struct _timeb t;
+       if (_ftime_s(&t)) {
+               return 0;
+       } else {
+               return 1000 * t.time + t.millitm;
+       }
+#else
+       struct timespec t;
+       clock_gettime(CLOCK_MONOTONIC, &t);
+       return (t.tv_sec * 1000 + t.tv_nsec / 1000000);
+#endif
+}