64-bit fixes for distrrtgen

[freerainbowtables] / Common / rt api / HashAlgorithm.h

diff --git a/Common/rt api/HashAlgorithm.h b/Common/rt api/HashAlgorithm.h
index 667245aa290daea63cd306aa5e1df911c869ad4b..01a4d74ca8c3e7eca859f807a218271f64f92a39 100644 (file)
--- a/Common/rt api/HashAlgorithm.h
+++ b/Common/rt api/HashAlgorithm.h
@@ -1,8 +1,27 @@
 /*
-   RainbowCrack - a general propose implementation of Philippe Oechslin's faster time-memory trade-off technique.
-
-   Copyright (C) Zhu Shuanglei <shuanglei@hotmail.com>
-*/
+ * freerainbowtables is a project for generating, distributing, and using
+ * perfect rainbow tables
+ *
+ * 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 freerainbowtables.
+ *
+ * freerainbowtables 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.
+ *
+ * freerainbowtables 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 freerainbowtables.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #ifndef _HASHALGORITHM_H
 #define _HASHALGORITHM_H
@@ -13,20 +32,23 @@ void HashNTLM(unsigned char* pPlain, int nPlainLen, unsigned char* pHash);
 void HashMD4(unsigned char* pPlain, int nPlainLen, unsigned char* pHash);
 void HashMD5(unsigned char* pPlain, int nPlainLen, unsigned char* pHash);
 void HashDoubleMD5(unsigned char* pPlain, int nPlainLen, unsigned char* pHash);
-/*void HashSHA1(unsigned char* pPlain, int nPlainLen, unsigned char* pHash);
-void HashRIPEMD160(unsigned char* pPlain, int nPlainLen, unsigned char* pHash);
+void HashSHA1(unsigned char* pPlain, int nPlainLen, unsigned char* pHash);
+//void HashRIPEMD160(unsigned char* pPlain, int nPlainLen, unsigned char* pHash);
 void HashMSCACHE(unsigned char *pPlain, int nPlainLen, unsigned char* pHash);
+
 //****************************************************************************
 // MySQL Password Hashing
 //****************************************************************************
+
 void HashMySQL323(unsigned char* pPlain, int nPlainLen, unsigned char* pHash);
 void HashMySQLSHA1(unsigned char* pPlain, int nPlainLen, unsigned char* pHash);
 
 //****************************************************************************
 // Cisco PIX Password Hashing
 //****************************************************************************
+
 void HashPIX(unsigned char* pPlain, int nPlainLen, unsigned char* pHash);
-*/
+
 //****************************************************************************
 // (HALF) LM CHALL hashing
 void HashLMCHALL(unsigned char* pPlain, int nPlainLen, unsigned char* pHash);
@@ -34,6 +56,9 @@ void HashHALFLMCHALL(unsigned char* pPlain, int nPlainLen, unsigned char* pHash)
 
 // From mao
 void HashNTLMCHALL(unsigned char* pPlain, int nPlainLen, unsigned char* pHash);
-//void HashORACLE(unsigned char* pPlain, int nPlainLen, unsigned char* pHash);
+void HashORACLE(unsigned char* pPlain, int nPlainLen, unsigned char* pHash);
 
+#if !defined(_WIN32) || defined(__GNUC__)
+char *strupr(char *s1);
+#endif
 #endif