Changed files to compile md5c.c

diff --git a/ChangeLog b/ChangeLog
index 4169bdbbfc7c584c6bb8ec58444f79b2b78460d0..0f622653077bc466aeaa56af71d65427291a9619 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-26  Hector Garcia <hector@debian.org>
+       * md5c.c: Changed depend to "md5.h"
+       * md5.h: Included it from sys/md5.h
+       * Makefile: Changed it to compile md5c.c
+
 2005-07-25  Guillem Jover  <guillem@debian.org>
 
        * fgetln.c (fgetln): Reindent, remove commented code and translate

diff --git a/Makefile b/Makefile
index 790a2d6b8b7489e1140ac9d9be34dd6b8bf4ec7d..d1d5e41fd0d6c27d06bb279e33f80f907b6e69b4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,7 @@
 # $Id$
 #
 
-LIB_SRCS = arc4random.c fgetln.c inet_net_pton.c strlcat.c strlcpy.c
-# Disabled until being fixed
-#LIB_SRCS += md5c.c
+LIB_SRCS = arc4random.c fgetln.c inet_net_pton.c strlcat.c strlcpy.c md5c.c
 
 LIB_INCLUDES = bsd.h
 

diff --git a/md5.h b/md5.h
index 803a88fc6bff80e38f164af604e6b49df68adbda..4eabbf9fc7f8601672de4bb245ca8fedcb5ec84c 100644 (file)
--- a/md5.h
+++ b/md5.h
@@ -1,4 +1,48 @@
-#ifndef _MD5_H_
-#define _MD5_H_
-#include <sys/md5.h>
-#endif /* _MD5_H_ */
+/* MD5.H - header file for MD5C.C
+ * $FreeBSD: src/sys/sys/md5.h,v 1.16 2002/06/24 14:18:39 mux Exp $
+ */
+
+/* Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+rights reserved.
+
+License to copy and use this software is granted provided that it
+is identified as the "RSA Data Security, Inc. MD5 Message-Digest
+Algorithm" in all material mentioning or referencing this software
+or this function.
+
+License is also granted to make and use derivative works provided
+that such works are identified as "derived from the RSA Data
+Security, Inc. MD5 Message-Digest Algorithm" in all material
+mentioning or referencing the derived work.
+
+RSA Data Security, Inc. makes no representations concerning either
+the merchantability of this software or the suitability of this
+software for any particular purpose. It is provided "as is"
+without express or implied warranty of any kind.
+
+These notices must be retained in any copies of any part of this
+documentation and/or software.
+ */
+
+#ifndef _SYS_MD5_H_
+#define _SYS_MD5_H_
+/* MD5 context. */
+typedef struct MD5Context {
+  u_int32_t state[4];  /* state (ABCD) */
+  u_int32_t count[2];  /* number of bits, modulo 2^64 (lsb first) */
+  unsigned char buffer[64];    /* input buffer */
+} MD5_CTX;
+
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+void   MD5Init (MD5_CTX *);
+void   MD5Update (MD5_CTX *, const unsigned char *, unsigned int);
+void   MD5Pad (MD5_CTX *);
+void   MD5Final (unsigned char [16], MD5_CTX *);
+char * MD5End(MD5_CTX *, char *);
+char * MD5File(const char *, char *);
+char * MD5FileChunk(const char *, char *, off_t, off_t);
+char * MD5Data(const unsigned char *, unsigned int, char *);
+__END_DECLS
+#endif /* _SYS_MD5_H_ */

diff --git a/md5c.c b/md5c.c
index 96e124c48e139ef88f8d7b9e2439fddfa383b031..ca10d68ecf9a8e31fce3ff90bfef5ea976ef98ce 100644 (file)
--- a/md5c.c
+++ b/md5c.c
@@ -39,7 +39,7 @@ __FBSDID("$FreeBSD: src/lib/libmd/md5c.c,v 1.16 2003/06/05 13:17:32 markm Exp $"
 
 //#include <machine/endian.h>
 //#include <sys/endian.h>
-//#include <sys/md5.h>
+#include "md5.h"
 
 static void MD5Transform(u_int32_t [4], const unsigned char [64]);