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 2959787041a0f828af291ccaf256b48f7dc850f8..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
@@ -183,7 +183,7 @@ bool NormalizeHash(string& sHash)
                return false;\r
 \r
        // Make lower\r
-       UINT4 i;\r
+       uint32 i;\r
        for (i = 0; i < sNormalizedHash.size(); i++)\r
        {\r
                if (sNormalizedHash[i] >= 'A' && sNormalizedHash[i] <= 'F')\r
@@ -207,11 +207,11 @@ void LoadLMHashFromPwdumpFile(string sPathName, vector<string>& vUserName, vecto
        vector<string> vLine;\r
        if (ReadLinesFromFile(sPathName, vLine))\r
        {\r
-               UINT4 i;\r
+               uint32 i;\r
                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
@@ -241,11 +241,11 @@ void LoadLMHashFromCainLSTFile(string sPathName, vector<string>& vUserName, vect
        vector<string> vLine;\r
        if (ReadLinesFromFile(sPathName, vLine))\r
        {\r
-               UINT4 i;\r
+               uint32 i;\r
                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
@@ -313,7 +313,7 @@ bool LMPasswordCorrectCase(string sLMPassword, unsigned char* pNTLMHash, string&
        }\r
 \r
        unsigned char* pLMPassword = new unsigned char[sLMPassword.size() * 2];\r
-       UINT4 i;\r
+       uint32 i;\r
        for (i = 0; i < sLMPassword.size(); i++)\r
        {\r
                pLMPassword[i * 2    ] = sLMPassword[i];\r
@@ -399,13 +399,13 @@ int main(int argc, char* argv[])
        }\r
        if (readFromIni)\r
        {\r
-               UINT4 i;\r
+               uint32 i;\r
                for (i = 0; i < vLine.size(); i++)\r
                {\r
                        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
@@ -540,11 +540,11 @@ int main(int argc, char* argv[])
                vector<string> sSessionData;\r
                if (ReadLinesFromFile(sSessionPathName.c_str(), sSessionData))\r
                {\r
-                       UINT4 i;\r
+                       uint32 i;\r
                        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
@@ -581,11 +581,11 @@ int main(int argc, char* argv[])
        // don't load these if we are resuming a session that already has a list of tables\r
        if (useDefaultRainbowTablePath && !resumeSession)\r
        {\r
-               UINT4 i;\r
+               uint32 i;\r
                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
@@ -630,7 +630,7 @@ int main(int argc, char* argv[])
                vector<string> vLine;\r
                if (ReadLinesFromFile(sPathName, vLine))\r
                {\r
-                       UINT4 i;\r
+                       uint32 i;\r
                        for (i = 0; i < vLine.size(); i++)\r
                        {\r
                                string sHash = vLine[i];\r
@@ -676,13 +676,13 @@ int main(int argc, char* argv[])
 \r
        if (fCrackerType)\r
        {\r
-               UINT4 i;\r
+               uint32 i;\r
                for (i = 0; i < vHash.size(); i++)\r
                        hs.AddHash(vHash[i]);\r
        }\r
        else\r
        {\r
-               UINT4 i;\r
+               uint32 i;\r
                for (i = 0; i < vLMHash.size(); i++)\r
                {\r
                        hs.AddHash(vLMHash[i].substr(0, 16));\r
@@ -696,18 +696,18 @@ int main(int argc, char* argv[])
                vector<string> sSessionData;\r
                if (ReadLinesFromFile(sSessionPathName.c_str(), sSessionData))\r
                {\r
-                       UINT4 i;\r
+                       uint32 i;\r
                        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
@@ -732,7 +731,7 @@ int main(int argc, char* argv[])
                        buffer += "sInputType=" + sInputType + "\n";\r
                        buffer += "sInput=" + sInput + "\n";\r
 \r
-                       UINT4 i;\r
+                       uint32 i;\r
                        for (i = 0; i < vPathName.size(); i++)\r
                        {\r
                                buffer += "sPathName=" + vPathName[i] + "\n";\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
@@ -786,7 +787,7 @@ int main(int argc, char* argv[])
        printf("-------------------------------------------------------\n");\r
        if (fCrackerType)\r
        {\r
-               UINT4 i;\r
+               uint32 i;\r
                for (i = 0; i < vHash.size(); i++)\r
                {\r
                        string sPlain, sBinary;\r
@@ -801,7 +802,7 @@ int main(int argc, char* argv[])
        }\r
        else\r
        {\r
-               UINT4 i;\r
+               uint32 i;\r
                for (i = 0; i < vLMHash.size(); i++)\r
                {\r
                        string sPlain1, sBinary1;\r