X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/6b1111d7b88efe0c22d793e08c501d37a9635e9c..d1e197e9ec44affdf3ad9ef0ea6a221d0c30aa6d:/client/loclass/elite_crack.c

diff --git a/client/loclass/elite_crack.c b/client/loclass/elite_crack.c
index 2329e597..29b7f04d 100644
--- a/client/loclass/elite_crack.c
+++ b/client/loclass/elite_crack.c
@@ -71,7 +71,6 @@
  */
 void permutekey(uint8_t key[8], uint8_t dest[8])
 {
-
 	int i;
 	for(i = 0 ; i < 8 ; i++)
 	{
@@ -84,7 +83,6 @@ void permutekey(uint8_t key[8], uint8_t dest[8])
 					(((key[1] & (0x80 >> i)) >> (7-i)) << 1) |
 					(((key[0] & (0x80 >> i)) >> (7-i)) << 0);
 	}
-
 	return;
 }
 /**
@@ -522,8 +520,8 @@ int bruteforceDump(uint8_t dump[], size_t dumpsize, uint16_t keytable[])
 		errors += bruteforceItem(*attack, keytable);
 	}
 	free(attack);
-	clock_t t2 = clock();
-	float diff = (((float)t2 - (float)t1) / CLOCKS_PER_SEC );
+	t1 = clock() - t1;
+	float diff = ((float)t1 / CLOCKS_PER_SEC );
 	prnlog("\nPerformed full crack in %f seconds",diff);
 
 	// Pick out the first 16 bytes of the keytable.
@@ -552,7 +550,6 @@ int bruteforceDump(uint8_t dump[], size_t dumpsize, uint16_t keytable[])
  */
 int bruteforceFile(const char *filename, uint16_t keytable[])
 {
-
 	FILE *f = fopen(filename, "rb");
 	if(!f) {
 		prnlog("Failed to read from file '%s'", filename);
@@ -565,19 +562,23 @@ int bruteforceFile(const char *filename, uint16_t keytable[])
 
 	if (fsize < 0) {
 		prnlog("Error, when getting filesize");
-		fclose(f);
+		if (f) {
+			fclose(f);
+			f = NULL;
+		}
 		return 1;
 	}
 
 	uint8_t *dump = malloc(fsize);
 	size_t bytes_read = fread(dump, 1, fsize, f);
 
-	fclose(f);
-    if (bytes_read < fsize)
-    {
+	if (f) {
+		fclose(f);
+		f = NULL;
+	}
+    if (bytes_read < fsize) {
         prnlog("Error, could only read %d bytes (should be %d)",bytes_read, fsize );
     }
-
 	uint8_t res = bruteforceDump(dump,fsize,keytable);
 	free(dump);
 	return res;