UINT4 -> uint32

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

diff --git a/Client Applications/rcracki_mt/CrackEngine.cpp b/Client Applications/rcracki_mt/CrackEngine.cpp
index 1e00fce729b8a17b08db54b1293b762c6849b08a..d36ebbc74556e4717eb8ca53cf73992d4e22ccd0 100644 (file)
--- a/Client Applications/rcracki_mt/CrackEngine.cpp
+++ b/Client Applications/rcracki_mt/CrackEngine.cpp
@@ -328,7 +328,7 @@ void CCrackEngine::SearchTableChunkOld(RainbowChainO* pChain, int nRainbowChainL
 \r
        bool pausing = false;\r
 \r
-       UINT4 nHashIndex;\r
+       uint32 nHashIndex;\r
        for (nHashIndex = 0; nHashIndex < vHash.size(); nHashIndex++)\r
        {\r
                #ifdef _WIN32\r
@@ -442,7 +442,7 @@ void CCrackEngine::SearchTableChunkOld(RainbowChainO* pChain, int nRainbowChainL
                        threadPool.clear();\r
                        pThreads.clear();\r
                        \r
-                       UINT4 thread_ID;\r
+                       uint32 thread_ID;\r
                        for (thread_ID = 0; thread_ID < (unsigned long)maxThreads; thread_ID++)\r
                        {\r
                                rcrackiThread* r_Thread = new rcrackiThread(TargetHash, thread_ID, nRainbowChainLen, maxThreads, pStartPosIndexE);\r
@@ -511,7 +511,7 @@ void CCrackEngine::SearchTableChunkOld(RainbowChainO* pChain, int nRainbowChainL
                        threadPool.push_back(r_Thread);\r
                }\r
 \r
-               UINT4 thread_ID = 0;\r
+               uint32 thread_ID = 0;\r
                int nPos;\r
                for (nPos = nRainbowChainLen - 2; nPos >= 0; nPos--)\r
                {\r
@@ -655,7 +655,7 @@ void CCrackEngine::SearchTableChunk(RainbowChain* pChain, int nRainbowChainLen,
 \r
        bool pausing = false;\r
 \r
-       UINT4 nHashIndex;\r
+       uint32 nHashIndex;\r
        for (nHashIndex = 0; nHashIndex < vHash.size(); nHashIndex++)\r
        {\r
                #ifdef _WIN32\r
@@ -772,7 +772,7 @@ void CCrackEngine::SearchTableChunk(RainbowChain* pChain, int nRainbowChainLen,
                        threadPool.clear();\r
                        pThreads.clear();\r
                        \r
-                       UINT4 thread_ID;\r
+                       uint32 thread_ID;\r
                        for (thread_ID = 0; thread_ID < (unsigned long)maxThreads; thread_ID++)\r
                        {\r
                                rcrackiThread* r_Thread = new rcrackiThread(TargetHash, thread_ID, nRainbowChainLen, maxThreads, pStartPosIndexE);\r
@@ -846,7 +846,7 @@ void CCrackEngine::SearchTableChunk(RainbowChain* pChain, int nRainbowChainLen,
                        threadPool.push_back(r_Thread);\r
                }\r
 \r
-               UINT4 thread_ID = 0;\r
+               uint32 thread_ID = 0;\r
                int nPos;\r
                for (nPos = nRainbowChainLen - 2; nPos >= 0; nPos--)\r
                {\r
@@ -956,7 +956,7 @@ void CCrackEngine::SearchRainbowTable(string sPathName, CHashSet& hs)
                vector<string> sessionFinishedPathNames;\r
                if (ReadLinesFromFile(sProgressPathName.c_str(), sessionFinishedPathNames))\r
                {\r
-                       UINT4 i;\r
+                       uint32 i;\r
                        for (i = 0; i < sessionFinishedPathNames.size(); i++)\r
                        {\r
                                if (sessionFinishedPathNames[i] == sPathName)\r
@@ -1002,9 +1002,9 @@ void CCrackEngine::SearchRainbowTable(string sPathName, CHashSet& hs)
                // File length check\r
                bool doOldFormat = CChainWalkContext::isOldFormat();\r
                bool doRti2Format = CChainWalkContext::isRti2Format();\r
-               UINT4 sizeOfChain;\r
+               uint32 sizeOfChain;\r
                bool fVerified = false;\r
-               UINT4 nFileLen = GetFileLen(file);\r
+               long nFileLen = GetFileLen(file);\r
 \r
                if (doOldFormat)\r
                        sizeOfChain = 16;\r
@@ -1012,7 +1012,7 @@ void CCrackEngine::SearchRainbowTable(string sPathName, CHashSet& hs)
                        sizeOfChain = 8;\r
 \r
                //if (nFileLen % 8 != 0 || nRainbowChainCount * 8 != nFileLen)\r
-               if ( (nFileLen % sizeOfChain != 0 || nRainbowChainCount * sizeOfChain != nFileLen) && doRti2Format == false )\r
+               if ( ( (unsigned long)nFileLen % sizeOfChain != 0 || nRainbowChainCount * sizeOfChain != (unsigned long)nFileLen) && doRti2Format == false )\r
                        printf("file length mismatch\n");\r
                else\r
                {\r
@@ -1059,7 +1059,7 @@ void CCrackEngine::SearchRainbowTable(string sPathName, CHashSet& hs)
                                        //bool fVerified = false;\r
                                        while (true)    // Chunk read loop\r
                                        {\r
-                                               if ((unsigned long)ftell(file) == nFileLen)\r
+                                               if (ftell(file) == nFileLen)\r
                                                        break;\r
 \r
                                                // Load table chunk\r
@@ -1229,8 +1229,8 @@ void CCrackEngine::SearchRainbowTable(string sPathName, CHashSet& hs)
 \r
                                                                        //fseek(file, 0, SEEK_SET);\r
                                                                        //bool fVerified = false;\r
-                                                                       UINT4 nProcessedChains = 0;\r
-                                                                       while ( (unsigned long)ftell(file) != nFileLen \r
+                                                                       uint32 nProcessedChains = 0;\r
+                                                                       while (ftell(file) != nFileLen \r
                                                                                && nProcessedChains < nCoveredRainbowTableChains )      // Chunk read loop\r
                                                                        {\r
                                                                                // Load table chunk\r
@@ -1360,7 +1360,7 @@ void CCrackEngine::Run(vector<string> vPathName, CHashSet& hs, int i_maxThreads,
        ResetStatistics();\r
 \r
        // Sort vPathName (CChainWalkSet need it)\r
-       UINT4 i, j;\r
+       uint32 i, j;\r
        for (i = 0; i < vPathName.size() - 1; i++)\r
                for (j = 0; j < vPathName.size() - i - 1; j++)\r
                {\r