merged paths

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

diff --git a/Client Applications/rcracki_mt/HashRoutine.cpp b/Client Applications/rcracki_mt/HashRoutine.cpp
index 02fbe71e9dab84f3715bfe857e7ebbcb7d46ab4f..595f13d29a044c93632128a23b4e3ebe93e278bd 100644 (file)
--- a/Client Applications/rcracki_mt/HashRoutine.cpp
+++ b/Client Applications/rcracki_mt/HashRoutine.cpp
@@ -1,10 +1,29 @@
 /*
-   RainbowCrack - a general propose implementation of Philippe Oechslin's faster time-memory trade-off technique.
+ * rcracki_mt is a multithreaded implementation and fork of the original 
+ * RainbowCrack
+ *
+ * Copyright (C) Zhu Shuanglei <shuanglei@hotmail.com>
+ * Copyright Martin Westergaard Jørgensen <martinwj2005@gmail.com>
+ * Copyright 2009, 2010 Daniël Niggebrugge <niggebrugge@fox-it.com>
+ * Copyright 2009, 2010 James Nobis <frt@quelrod.net>
+ *
+ * This file is part of rcracki_mt.
+ *
+ * rcracki_mt is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * rcracki_mt is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with rcracki_mt.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
-   Copyright (C) Zhu Shuanglei <shuanglei@hotmail.com>
-*/
-
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__GNUC__)
        #pragma warning(disable : 4786 4267 4018)
 #endif
 
@@ -20,12 +39,12 @@ CHashRoutine::CHashRoutine()
 
        AddHashRoutine("lm",   HashLM,   8);
        AddHashRoutine("ntlm", HashNTLM, 16);
-       AddHashRoutine("md2",  HashMD2,  16);
+//     AddHashRoutine("md2",  HashMD2,  16);
        AddHashRoutine("md4",  HashMD4,  16);
        AddHashRoutine("md5",  HashMD5,  16);
        AddHashRoutine("doublemd5",  HashDoubleMD5,  16);
        AddHashRoutine("sha1", HashSHA1, 20);
-       AddHashRoutine("ripemd160", HashRIPEMD160, 20);
+//     AddHashRoutine("ripemd160", HashRIPEMD160, 20);
        AddHashRoutine("mysql323", HashMySQL323, 8);
        AddHashRoutine("mysqlsha1", HashMySQLSHA1, 20);
        AddHashRoutine("ciscopix", HashPIX, 16);
@@ -36,7 +55,6 @@ CHashRoutine::CHashRoutine()
        AddHashRoutine("lmchall", HashLMCHALL, 24);
        AddHashRoutine("ntlmchall", HashNTLMCHALL, 24);
        AddHashRoutine("oracle", HashORACLE, 8);
-
 }
 
 CHashRoutine::~CHashRoutine()
@@ -53,7 +71,7 @@ void CHashRoutine::AddHashRoutine(string sHashRoutineName, HASHROUTINE pHashRout
 string CHashRoutine::GetAllHashRoutineName()
 {
        string sRet;
-       int i;
+       UINT4 i;
        for (i = 0; i < vHashRoutineName.size(); i++)
                sRet += vHashRoutineName[i] + " ";
 
@@ -62,7 +80,7 @@ string CHashRoutine::GetAllHashRoutineName()
 
 void CHashRoutine::GetHashRoutine(string sHashRoutineName, HASHROUTINE& pHashRoutine, int& nHashLen)
 {
-       int i;
+       UINT4 i;
        for (i = 0; i < vHashRoutineName.size(); i++)
        {
                if (sHashRoutineName == vHashRoutineName[i])