X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Common%2Frt%20api%2FHashAlgorithm.cpp;h=3fe33821ea4fc7c76ba0167ae6580200bd537e47;hb=47c71901e7a97c226c8f1df749e3606d43656f32;hp=e6f92c0c17a586e969c7380fee5bfc9b71ff031d;hpb=df8d800454d70f0fb39ab0c227ca55f91b581da7;p=freerainbowtables

diff --git a/Common/rt api/HashAlgorithm.cpp b/Common/rt api/HashAlgorithm.cpp
index e6f92c0..3fe3382 100644
--- a/Common/rt api/HashAlgorithm.cpp	
+++ b/Common/rt api/HashAlgorithm.cpp	
@@ -3,9 +3,9 @@
  * perfect rainbow tables
  *
  * Copyright (C) Zhu Shuanglei <shuanglei@hotmail.com>
- * Copyright Martin Westergaard Jørgensen <martinwj2005@gmail.com>
+ * Copyright 2009, 2010, 2011 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>
+ * Copyright 2009, 2010, 2011 James Nobis <frt@quelrod.net>
  *
  * This file is part of freerainbowtables.
  *
@@ -175,13 +175,13 @@ void HashORACLE(unsigned char* pPlain, int nPlainLen, unsigned char* pHash)
 	DES_key_schedule ks1,ks2;
 	unsigned char deskey_fixed[]={ 0x01, 0x23, 0x45, 0x67, 0x89, 0xab, 0xcd, 0xef};
 	int i,j;
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__GNUC__)
 	strcpy_s(username, sizeof(username), "SYS");
 #else
 	strcpy(username, "SYS");
 #endif
 	int userlen = 3;
-#ifdef _WIN32
+#if defined(_WIN32) && !defined(__GNUC__)
 	_strupr((char*) pPlain);
 #else
 	strupr((char*) pPlain);
@@ -210,6 +210,7 @@ void HashORACLE(unsigned char* pPlain, int nPlainLen, unsigned char* pHash)
 	memcpy (pHash,iv2,8);
 }
 */
+
 void HashNTLM(unsigned char* pPlain, int nPlainLen, unsigned char* pHash)
 {
 	unsigned char UnicodePlain[MAX_PLAIN_LEN * 2];
@@ -392,10 +393,6 @@ void HashPIX(unsigned char* pPlain, int nPlainLen, unsigned char* pHash)
 
 	memcpy (pass,pPlain,nPlainLen);
 
-	MD5_CTX ctx;
-	MD5_Init(&ctx);
-	MD5_Update(&ctx, (unsigned char *) pass, MD5_DIGEST_LENGTH);
-	MD5_Final(final, &ctx);
 	MD5_NEW((unsigned char *) pass, MD5_DIGEST_LENGTH, final);
 
 	char* p = (char*) temp;