Commit: e60eb2f3e13c864e156c284aca0716413d4c5fbc - FinalCrypt (git)

FinalCrypt - The No¹ One-Time Pad Encryption

Commit MetaInfo

• Revision: e60eb2f3e13c864e156c284aca0716413d4c5fbc (tree)
• Time: 2019-11-13 12:39:33
• Author: ron <ronuitzaandam@gmai...>
• Commiter: ron

Log Message

Date: 2019-11-13 Version: 5.6.3

Brute Force password dictionary testing 10 x faster
Previously: 950 pass/sec. Currently: 9950 pass/sec

Change Summary

• modified: changelog.txt
• modified: manpage.txt
• modified: manpage_examples.txt
• modified: nbproject/project.properties
• modified: src/rdj/CLUI.java
• modified: src/rdj/Stats.java
• modified: src/rdj/VERSION
• modified: src/rdj/VERSION2

Incremental Difference

--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,9 @@
-Date: 2019-10-04 Version: 5.6.2
+Date: 2019-11-13 Version: 5.6.3
+
+Brute Force password dictionary testing 10 x faster
+Previously: 950 pass/sec. Currently: 9950 pass/sec
+
+Date: 2019-11-04 Version: 5.6.2
 
 Cleaned up action-buttons to improve usage clarity
 

--- a/manpage.txt
+++ b/manpage.txt
@@ -62,4 +62,4 @@ Parameters:
             <[-t "file/dir"]>                                               Target items (files or directories) you want to encrypt (recursive).
             <[-b "batchfile"]>                                              Batchfile with targetfiles you want to encrypt (only files).
 
-FinalCrypt 5.6.2 - Author: Ron de Jong <[e-mail]> - Copyright: © 2017-2019
\ No newline at end of file
+FinalCrypt 5.6.3 - Author: Ron de Jong <[e-mail]> - Copyright: © 2017-2019
\ No newline at end of file

--- a/manpage_examples.txt
+++ b/manpage_examples.txt
@@ -76,4 +76,4 @@ Key Device Examples (Linux):
             java -cp finalcrypt.jar rdj/CLUI --encrypt -k /dev/sdc1 -t myfile
             java -cp finalcrypt.jar rdj/CLUI --decrypt -k /dev/sdc1 -t myfile
 
-FinalCrypt 5.6.2 - Author: Ron de Jong <[e-mail]> - Copyright: © 2017-2019
\ No newline at end of file
+FinalCrypt 5.6.3 - Author: Ron de Jong <[e-mail]> - Copyright: © 2017-2019
\ No newline at end of file

--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -8,7 +8,7 @@ application.homepage=http://www.finalcrypt.org/
 application.splash=
 application.title=FinalCrypt
 application.vendor=FinalCrypt
-application.implementation.version=5.6.2
+application.implementation.version=5.6.3
 auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=false
 auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=4
 auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=4

--- a/src/rdj/CLUI.java
+++ b/src/rdj/CLUI.java
@@ -122,7 +122,10 @@ public class CLUI implements UI
     protected boolean test =		false;
     protected String testAnswer =		"";
     protected FCPath keyFCPath;
-    
+    protected FCPath bruteForceFCPathTargetPrint;
+    private int bfcounter;
+    private int bflines;
+    private Stats bruteForceDataStats;    
     
     public CLUI(String[] args)
     {	
@@ -451,14 +454,21 @@ public class CLUI implements UI
 		FCPath dictFileFCPath = Validate.getFCPath(ui, "NA", Paths.get(dictionaryFilePathString), false, Paths.get(dictionaryFilePathString), false, true);
 		if ( ( dictFileFCPath.exist ) && (dictFileFCPath.isValidFile) && (dictFileFCPath.isReadable) && ( dictFileFCPath.size > 0) )
 		{
-		    int lines = 0;
-		    try { lines = Files.readAllLines(dictFileFCPath.path).size(); } catch (IOException ex) { log("Files.readAllLines(" + dictFileFCPath.path.toAbsolutePath().toString() + ").size();" + ex.getMessage(), false, true, true, true, false); }
-
-		    long counter = 1;
-		    Stats allDataStats = new Stats(); allDataStats.reset();
-		    allDataStats.setAllDataStartNanoTime(); allDataStats.clock();
-
-		    log("\r\nStart Brute Force testing " + lines + " passwords...\r\n\r\n", false, true, true, false, false); 
+		    bflines = 0;
+		    try { bflines = Files.readAllLines(dictFileFCPath.path).size(); } catch (IOException ex) { log("Files.readAllLines(" + dictFileFCPath.path.toAbsolutePath().toString() + ").size();" + ex.getMessage(), false, true, true, true, false); }
+
+		    bfcounter = 1;
+		    bruteForceDataStats = new Stats(); bruteForceDataStats.reset();
+		    bruteForceDataStats.setAllDataStartNanoTime(); bruteForceDataStats.clock();
+		    		    
+		    TimerTask printTask = new TimerTask() { @Override public void run()
+		    {
+			if ( bruteForceFCPathTargetPrint != null ) { log("Brute Force testing target: \"" + bruteForceFCPathTargetPrint.path.toAbsolutePath().toString() + "\" password count: " + bfcounter + " " + (bfcounter / (bflines / 100 )) + "% \r\n", false, true, false, false, false); } 
+		    }};
+		    Timer printTimer = new java.util.Timer(); printTimer.schedule(printTask, 1000L, 1000L);
+		    
+		    log("\r\nStart Brute Force testing " + bflines + " passwords...\r\n\r\n", false, true, true, false, false); 
+		    log("Brute Force testing target: \"" + targetFCPathList.get(0).path.toAbsolutePath().toString() + "\" password count: " + 1 + " " + (bfcounter / (bflines / 100 )) + "%\r\n", false, true, false, false, false);
 		    try
 		    {
 			boolean pwdFound = false;
@@ -477,23 +487,27 @@ public class CLUI implements UI
 			    Validate.buildSelection(this,			          targetPathList,    keyFCPath,		          targetFCPathList,	    symlink,	    pattern,	     negatePattern, finalCrypt.disabledMAC,         false);
 			    pathlistloop: for (FCPath fcPathItem : targetFCPathList)
 			    {
-				log(counter + " testing target: \"" + fcPathItem.path.toAbsolutePath().toString() + "\" password: \"" + pwd + "\" result: " + fcPathItem.isDecryptable + "\r\n", false, true, true, false, false);
+				bruteForceFCPathTargetPrint = fcPathItem;
+//				log(bfcounter + " testing target: \"" + fcPathItem.path.toAbsolutePath().toString() + "\" password: \"" + pwd + "\" result: " + fcPathItem.isDecryptable + "\r\n", false, true, false, false, false);
+				bfcounter++;
 				if (fcPathItem.isDecryptable) { pwdFound = true; break pwloop; }
-				counter++;
 			    }
 			}
+			
+			if ( bruteForceFCPathTargetPrint != null ) { log("Brute Force testing target: \"" + bruteForceFCPathTargetPrint.path.toAbsolutePath().toString() + "\" password count: " + (bfcounter - 1) + " " + (bfcounter / (bflines / 100 )) + "%\r\n", false, true, false, false, false); } 
 			if (pwdFound)
 			{
-			    log("\r\nPassword found: \"" + pwd + "\"\r\n", false, true, true, false, false);
+			    log("\r\nPassword found: \"" + pwd + "\"\r\n", false, true, false, false, false);
 			}
 			else
 			{
-			    log("\r\nPassword not found\r\n", false, true, true, false, false);
+			    log("\r\nPassword not found\r\n", false, true, false, false, false);
 			}
 		    }
 		    catch (IOException ex) { log("Files.readAllLines(" + dictFileFCPath.path + ");" + ex.getMessage(), false, true, true, true, false); }
-		    allDataStats.setAllDataEndNanoTime(); allDataStats.clock();
-		    log("\r\nFinished Brute force testing " + (counter - 1) + " / " + lines + " passwords in " + allDataStats.getElapsedTime(allDataStats.getAllDataEndEpoch() - allDataStats.getAllDataStartEpoch()) + " " + allDataStats.getBruteForceThroughPut(counter, allDataStats.getAllDataEndEpoch() - allDataStats.getAllDataStartEpoch()) + "\r\n\r\n", false, true, true, false, false);
+		    bruteForceDataStats.setAllDataEndNanoTime(); bruteForceDataStats.clock();
+		    printTimer.cancel(); printTimer.purge();
+		    log("\r\nFinished Brute force testing " + (bfcounter - 1) + " / " + bflines + " passwords in " + bruteForceDataStats.getElapsedTime(bruteForceDataStats.getAllDataEndEpoch() - bruteForceDataStats.getAllDataStartEpoch()) + " " + bruteForceDataStats.getBruteForceThroughPut(bfcounter, bruteForceDataStats.getAllDataEndEpoch() - bruteForceDataStats.getAllDataStartEpoch()) + "\r\n\r\n", false, true, true, false, false);
 		}
 		else
 		{

--- a/src/rdj/Stats.java
+++ b/src/rdj/Stats.java
@@ -177,8 +177,9 @@ public class Stats
     {
         String returnString = new String();
         double throughput = ( ((double)(items) / (((double)nanosecs / 1000000000.0))) ); // *1000 from mSec to Sec
-        String throughputString = String.format("%.1f", throughput);
-        returnString = "(average: " + getHumanSize(throughput,1,"Passwords") + "/s)\r\n";
+        String throughputString = String.format("%.0f", throughput);
+//        returnString = "(average: " + getHumanSize(throughput,1,"Passwords") + "/s)\r\n";
+        returnString = "(average: " + throughputString + " passwords/sec)\r\n";
         
         return returnString;
     }

--- a/src/rdj/VERSION
+++ b/src/rdj/VERSION
@@ -1 +1 @@
-5.6.2
\ No newline at end of file
+5.6.3
\ No newline at end of file

--- a/src/rdj/VERSION2
+++ b/src/rdj/VERSION2
@@ -1,4 +1,4 @@
-[Version] =		{5.6.2}
+[Version] =		{5.6.3}
 [] = {} ================================================================
 [Release Notes] =	{You are using a very old version of FinalCrypt}
 [Release Message] =	{Please visit the website and download the latest}
@@ -19,9 +19,10 @@
 [Upgrade Notes] =	{Brute Force only works on the Command Line Interface}
 [Upgrade Notes] =	{}
 [] = {} ----------------------------------------------------------------
-[Update Notes] =	{Update 2}
+[Update Notes] =	{Update 3}
 [Update Notes] =	{}
-[Update Notes] =	{Cleaned up action-buttons to improve usage clarity}
+[Update Notes] =	{Brute Force password dictionary testing 10 x faster}
+[Update Notes] =	{Previously: 950 pass/sec. Currently: 9950 pass/sec}
 [] = {} --------------------------------------------------------------------------------------------------------
 [Alert Subject_] =	{}
 [Alert Notes_] =	{}