Merge branch 'master' of git@gitorious.org:freerainbowtables-applications/freerainbow...

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

diff --git a/Client Applications/rcracki_mt/RainbowCrack.cpp b/Client Applications/rcracki_mt/RainbowCrack.cpp
index 9814834a560c49476e052247f64f48b908590f89..812035411f55ffad9875543c12552ed8717f5614 100644 (file)
--- a/Client Applications/rcracki_mt/RainbowCrack.cpp
+++ b/Client Applications/rcracki_mt/RainbowCrack.cpp
@@ -16,7 +16,7 @@
  * 2009-01-04 - <james.dickson@comhem.se> - Slightly modified (or "fulhack" as \r
  * we say in sweden)  to support cain .lst files.\r
  *\r
- * This file is part of racrcki_mt.\r
+ * This file is part of rcracki_mt.\r
  *\r
  * rcracki_mt is free software: you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
@@ -32,7 +32,7 @@
  * along with rcracki_mt.  If not, see <http://www.gnu.org/licenses/>.\r
  */\r
 \r
-#ifdef _WIN32\r
+#if defined(_WIN32) && !defined(__GNUC__)\r
        #pragma warning(disable : 4786 4267 4018)\r
 #endif\r
 \r
@@ -49,7 +49,7 @@
        #include <dirent.h>\r
 #endif\r
 \r
-#ifdef _WIN32\r
+#if defined(_WIN32) && !defined(__GNUC__)\r
        #pragma comment(lib, "libeay32.lib")\r
 #endif\r
 \r
@@ -61,15 +61,15 @@ void GetTableList(string sWildCharPathName, vector<string>& vPathName)
        //vPathName.clear();\r
 \r
        string sPath;\r
-       int n = sWildCharPathName.find_last_of('\\');\r
+       string::size_type n = sWildCharPathName.find_last_of('\\');\r
 \r
-       if (n == (sWildCharPathName.size() - 1))\r
+       if ( n == (sWildCharPathName.size() - 1) )\r
        {\r
                sWildCharPathName = sWildCharPathName.substr(0, n);\r
                n = sWildCharPathName.find_last_of('\\');\r
        }\r
 \r
-       if (n != -1)\r
+       if (n != string::npos)\r
                sPath = sWildCharPathName.substr(0, n + 1);\r
 \r
        _finddata_t fd;\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,7 +207,7 @@ 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
@@ -241,7 +241,7 @@ 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
@@ -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,7 +399,7 @@ 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
@@ -540,7 +540,7 @@ 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
@@ -581,7 +581,7 @@ 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
@@ -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,7 +696,7 @@ 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
@@ -732,7 +732,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
@@ -786,7 +786,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 +801,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