Merge from Master

[l2tpns.git] / md5.h

diff --git a/md5.h b/md5.h
index 1ff5045..25a59e0 100644 (file)
--- a/md5.h
+++ b/md5.h
@@ -6,23 +6,24 @@
  * in the public domain.  See md5.c for more information.
  */
 
  * in the public domain.  See md5.c for more information.
  */
 

-#ifdef HAVE_OPENSSL
-#include <openssl/md5.h>
-#elif !defined(_MD5_H)
-#define _MD5_H
+#ifndef __MD5_H__
+#define __MD5_H__
+
+#define        MD5_DIGEST_SZ   16
+#define        MD5_BLOCK_SZ    64

 
 /* Any 32-bit or wider unsigned integer data type will do */
 typedef unsigned long MD5_u32plus;
 
 typedef struct {
 
 /* Any 32-bit or wider unsigned integer data type will do */
 typedef unsigned long MD5_u32plus;
 
 typedef struct {

-       MD5_u32plus lo, hi;
-       MD5_u32plus a, b, c, d;
-       unsigned char buffer[64];
-       MD5_u32plus block[16];
+    MD5_u32plus lo, hi;
+    MD5_u32plus a, b, c, d;
+    unsigned char buffer[MD5_BLOCK_SZ];
+    MD5_u32plus block[MD5_DIGEST_SZ];

 } MD5_CTX;
 
 extern void MD5_Init(MD5_CTX *ctx);
 extern void MD5_Update(MD5_CTX *ctx, void *data, unsigned long size);
 extern void MD5_Final(unsigned char *result, MD5_CTX *ctx);
 
 } MD5_CTX;
 
 extern void MD5_Init(MD5_CTX *ctx);
 extern void MD5_Update(MD5_CTX *ctx, void *data, unsigned long size);
 extern void MD5_Final(unsigned char *result, MD5_CTX *ctx);
 

-#endif
+#endif /* __MD5_H__ */