[Sumover-dev] [svn commit] r4317 - vic/branches/mpeg4/net

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

Author: soohyunc
Date: Thu Nov 13 18:26:26 2008
New Revision: 4317

Modified:
   vic/branches/mpeg4/net/crypt.cpp

Log:
(FreeBSD build error fixed)
it had a wrong md5.h inclusion. accordingly, unnecessary functions are deleted.

-- this commit was tested under FreeBSD 6.3-RELEASE
-- this commit is identical to r4315 at cc branch.
   (see log message r4315 at cc branch)


Modified: vic/branches/mpeg4/net/crypt.cpp
==============================================================================
--- vic/branches/mpeg4/net/crypt.cpp	(original)
+++ vic/branches/mpeg4/net/crypt.cpp	Thu Nov 13 18:26:26 2008
@@ -44,7 +44,7 @@
 #ifndef __FreeBSD__
 #include "md5.h"
 #else
-#include <openssl/md5.h> //SV-XXX: FreeBSD
+#include <md5.h>
 #endif
 
 Crypt::Crypt() : badpktlen_(0), badpbit_(0)
@@ -75,15 +75,9 @@
 	MD5_CTX context;
 	u_char hash[16];
 
-#ifndef __FreeBSD__
 	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));
 }