Fix typo: Seperate -> Separate.

[freerainbowtables] / Client Applications / rcracki_mt / RainbowCrack.cpp

diff --git a/Client Applications/rcracki_mt/RainbowCrack.cpp b/Client Applications/rcracki_mt/RainbowCrack.cpp
index 812035411f55ffad9875543c12552ed8717f5614..fcc6051340b2d53185cc40672b7c799ae70870ff 100644 (file)
--- a/Client Applications/rcracki_mt/RainbowCrack.cpp
+++ b/Client Applications/rcracki_mt/RainbowCrack.cpp
@@ -6,7 +6,7 @@
  * Copyright Martin Westergaard Jørgensen <martinwj2005@gmail.com>\r
  * Copyright 2009, 2010  Daniël Niggebrugge <niggebrugge@fox-it.com>\r
  * Copyright 2009 James Dickson\r
- * Copyright 2009, 2010 James Nobis <frt@quelrod.net>\r
+ * Copyright 2009, 2010, 2011 James Nobis <frt@quelrod.net>\r
  * Copyright 2010 uroskn\r
  *\r
  * Modified by Martin Westergaard Jørgensen <martinwj2005@gmail.com> to support  * indexed and hybrid tables\r
@@ -211,7 +211,7 @@ void LoadLMHashFromPwdumpFile(string sPathName, vector<string>& vUserName, vecto
                for (i = 0; i < vLine.size(); i++)\r
                {\r
                        vector<string> vPart;\r
-                       if (SeperateString(vLine[i], "::::", vPart))\r
+                       if (SeparateString(vLine[i], "::::", vPart))\r
                        {\r
                                string sUserName = vPart[0];\r
                                string sLMHash   = vPart[2];\r
@@ -245,7 +245,7 @@ void LoadLMHashFromCainLSTFile(string sPathName, vector<string>& vUserName, vect
                for (i = 0; i < vLine.size(); i++)\r
                {\r
                        vector<string> vPart;\r
-                       if (SeperateString(vLine[i], "\t\t\t\t\t\t", vPart))\r
+                       if (SeparateString(vLine[i], "\t\t\t\t\t\t", vPart))\r
                        {\r
                                string sUserName = vPart[0];\r
                                string sLMHash   = vPart[4];\r
@@ -405,7 +405,7 @@ int main(int argc, char* argv[])
                        if (vLine[i].substr(0,1) != "#")\r
                        {\r
                                vector<string> vPart;\r
-                               if (SeperateString(vLine[i], "=", vPart))\r
+                               if (SeparateString(vLine[i], "=", vPart))\r
                                {\r
                                        string sOption = vPart[0];\r
                                        string sValue  = vPart[1];\r
@@ -544,7 +544,7 @@ int main(int argc, char* argv[])
                        for (i = 0; i < sSessionData.size(); i++)\r
                        {\r
                                vector<string> vPart;\r
-                               if (SeperateString(sSessionData[i], "=", vPart))\r
+                               if (SeparateString(sSessionData[i], "=", vPart))\r
                                {\r
                                        string sOption = vPart[0];\r
                                        string sValue  = vPart[1];\r
@@ -585,7 +585,7 @@ int main(int argc, char* argv[])
                for (i = 0; i < vDefaultRainbowTablePath.size(); i++)\r
                {\r
                        vector<string> vPart;\r
-                       if (SeperateString(vDefaultRainbowTablePath[i], ".=", vPart))\r
+                       if (SeparateString(vDefaultRainbowTablePath[i], ".=", vPart))\r
                        {\r
                                string lineAlgorithm = vPart[1];\r
                                string linePath = vPart[2];\r
@@ -700,14 +700,14 @@ int main(int argc, char* argv[])
                        for (i = 0; i < sSessionData.size(); i++)\r
                        {\r
                                vector<string> vPart;\r
-                               if (SeperateString(sSessionData[i], "=", vPart))\r
+                               if (SeparateString(sSessionData[i], "=", vPart))\r
                                {\r
                                        string sOption = vPart[0];\r
                                        string sValue  = vPart[1];\r
                                        \r
                                        if (sOption == "sHash") {\r
                                                vector<string> vPartHash;\r
-                                               if (SeperateString(sValue, "::", vPartHash))\r
+                                               if (SeparateString(sValue, "::", vPartHash))\r
                                                {\r
                                                        string sHash = vPartHash[0];\r
                                                        string sBinary = vPartHash[1];\r
@@ -720,10 +720,9 @@ int main(int argc, char* argv[])
                        }\r
                }\r
        }\r
-\r
-       // (Over)write session data if we are not resuming\r
-       if (!resumeSession)\r
+       else\r
        {\r
+       // (Over)write session data if we are not resuming\r
                FILE* file = fopen(sSessionPathName.c_str(), "w");\r
                string buffer = "";\r
 \r
@@ -775,9 +774,11 @@ int main(int argc, char* argv[])
        printf("total disk access time:     %.2f s\n", ce.GetStatTotalDiskAccessTime());\r
        printf("total cryptanalysis time:   %.2f s\n", ce.GetStatTotalCryptanalysisTime());\r
        printf("total pre-calculation time: %.2f s\n", ce.GetStatTotalPrecalculationTime());\r
-       printf("total chain walk step:      %d\n",     ce.GetStatTotalChainWalkStep());\r
+//     printf("total chain walk step:      %d\n",     ce.GetStatTotalChainWalkStep());\r
+       printf("total chain walk step:      %llu\n",     ce.GetStatTotalChainWalkStep());\r
        printf("total false alarm:          %d\n",     ce.GetStatTotalFalseAlarm());\r
-       printf("total chain walk step due to false alarm: %d\n", ce.GetStatTotalChainWalkStepDueToFalseAlarm());\r
+//     printf("total chain walk step due to false alarm: %d\n", ce.GetStatTotalChainWalkStepDueToFalseAlarm());\r
+       printf("total chain walk step due to false alarm: %llu\n", ce.GetStatTotalChainWalkStepDueToFalseAlarm());\r
 //     printf("total chain walk step skipped due to checkpoints: %d\n", ce.GetStatTotalFalseAlarmSkipped()); // Checkpoints not used - yet\r
        printf("\n");\r
 \r