[Sumover-dev] [svn commit] r3756 - vic/trunk/net

[sumover-dev at cs.ucl.ac.uk]

Author: socrates
Date: Thu Jun  1 16:21:03 2006
New Revision: 3756

Modified:
   vic/trunk/net/crypt.cpp

Log:
Added #ifdefs for WIN32 use of the tools' own  MD5xxx() functions. FreeBSD patch uses system-wide functions MD5_xxx().

Modified: vic/trunk/net/crypt.cpp
==============================================================================
--- vic/trunk/net/crypt.cpp	(original)
+++ vic/trunk/net/crypt.cpp	Thu Jun  1 16:21:03 2006
@@ -41,8 +41,11 @@
 /*XXX*/
 #define PROTOTYPES 1 
 #include "global.h"
-//#include "md5.h"
+#ifdef WIN32
+#include "md5.h"
+#else
 #include <openssl/md5.h> //SV-XXX: FreeBSD
+#endif
 
 Crypt::Crypt() : badpktlen_(0), badpbit_(0)
 {
@@ -70,9 +73,17 @@
 int Crypt::set_key(const char* key)
 {
 	MD5_CTX context;
-	MD5_Init(&context); //SV-XXX: FreeBSD. Was own copy "MD5Init(&context)"
-	MD5_Update(&context, (u_char*)key, strlen(key)); //SV-XXX: FreeBSD. Was own copy "MD5Update(...)"
 	u_char hash[16];
-	MD5_Final((u_char *)hash, &context); //SV-XXX: FreeBSD. Was own copy "MD5Final(...)"
+
+#ifdef WIN32
+	MD5Init(&context);
+	MD5Update(&context, (u_char*)key, strlen(key));
+	MD5Final((u_char *)hash, &context);
+#else
+	MD5_Init(&context); //SV-XXX: FreeBSD.
+	MD5_Update(&context, (u_char*)key, strlen(key)); //SV-XXX: FreeBSD. 
+	MD5_Final((u_char *)hash, &context); //SV-XXX: FreeBSD.
+#endif
+
 	return (install_key(hash));
 }