X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/b31ef4f5104384d0d301dcd27d11b3a9861b1d82..b5a5fc4d9f6bae6a02f1d71ea4769f86b6cb6fb8:/client/loclass/elite_crack.c
diff --git a/client/loclass/elite_crack.c b/client/loclass/elite_crack.c
index e9814e95..fe9bf7d1 100644
--- a/client/loclass/elite_crack.c
+++ b/client/loclass/elite_crack.c
@@ -22,7 +22,7 @@
*
* This is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
+ * by the Free Software Foundation, or, at your option, any later version.
*
* This file is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -33,20 +33,20 @@
* along with loclass. If not, see .
*
*
- *
****************************************************************************/
#include
#include
#include
#include
-#include
+#include "util.h"
+#include "util_posix.h"
#include "cipherutils.h"
#include "cipher.h"
#include "ikeys.h"
#include "elite_crack.h"
#include "fileutils.h"
-#include "des.h"
+#include "polarssl/des.h"
/**
* @brief Permutes a key from standard NIST format to Iclass specific format
@@ -512,7 +512,7 @@ int bruteforceDump(uint8_t dump[], size_t dumpsize, uint16_t keytable[])
uint8_t i;
int errors = 0;
size_t itemsize = sizeof(dumpdata);
- clock_t t1 = clock();
+ uint64_t t1 = msclock();
dumpdata* attack = (dumpdata* ) malloc(itemsize);
@@ -522,9 +522,9 @@ int bruteforceDump(uint8_t dump[], size_t dumpsize, uint16_t keytable[])
errors += bruteforceItem(*attack, keytable);
}
free(attack);
- t1 = clock() - t1;
- float diff = ((float)t1 / CLOCKS_PER_SEC );
- prnlog("\nPerformed full crack in %f seconds",diff);
+ t1 = msclock() - t1;
+ float diff = (float)t1 / 1000.0;
+ prnlog("\nPerformed full crack in %f seconds", diff);
// Pick out the first 16 bytes of the keytable.
// The keytable is now in 16-bit ints, where the upper 8 bits