[src/trunk]: src split /usr/include/sys/md5.h and /usr/include/md5.h completely.

[itojun <itojun%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/042501c8475a
branches:  trunk
changeset: 500426:042501c8475a
user:      itojun <itojun%NetBSD.org@localhost>
date:      Mon Dec 11 21:05:14 2000 +0000

description:
split /usr/include/sys/md5.h and /usr/include/md5.h completely.
future direction: nuke /usr/include/sys/md5.h, it shouldn't be there as
we don't provide libkern to userland.

diffstat:

 include/Makefile |   4 ++--
 include/md5.h    |  55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 sys/sys/Makefile |   3 +--
 3 files changed, 58 insertions(+), 4 deletions(-)

diffs (94 lines):

diff -r 8ae672ddb679 -r 042501c8475a include/Makefile
--- a/include/Makefile  Mon Dec 11 20:05:33 2000 +0000
+++ b/include/Makefile  Mon Dec 11 21:05:14 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.92 2000/07/05 11:44:01 ad Exp $
+#      $NetBSD: Makefile,v 1.93 2000/12/11 21:05:15 itojun Exp $
 #      @(#)Makefile    8.2 (Berkeley) 1/4/94
 
 # Doing a make includes builds /usr/include
@@ -10,7 +10,7 @@
        getopt.h glob.h grp.h hesiod.h ieeefp.h ifaddrs.h \
        iso646.h kvm.h langinfo.h libgen.h \
        limits.h link.h link_aout.h link_elf.h locale.h \
-       login_cap.h malloc.h math.h md4.h \
+       login_cap.h malloc.h math.h md4.h md5.h \
        memory.h mpool.h ndbm.h netconfig.h netdb.h netgroup.h nlist.h \
        nl_types.h \
        nsswitch.h paths.h pwd.h ranlib.h re_comp.h regex.h regexp.h \
diff -r 8ae672ddb679 -r 042501c8475a include/md5.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/include/md5.h     Mon Dec 11 21:05:14 2000 +0000
@@ -0,0 +1,55 @@
+/*     $NetBSD: md5.h,v 1.3 2000/12/11 21:05:15 itojun Exp $   */
+
+/*
+ * This file is derived from the RSA Data Security, Inc. MD5 Message-Digest
+ * Algorithm and has been modified by Jason R. Thorpe <thorpej%NetBSD.ORG@localhost>
+ * for portability and formatting.
+ */
+
+/*
+ * 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_
+
+#include <sys/types.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;
+
+__BEGIN_DECLS
+void   MD5Init __P((MD5_CTX *));
+void   MD5Update __P((MD5_CTX *, const unsigned char *, unsigned int));
+void   MD5Final __P((unsigned char[16], MD5_CTX *));
+#ifndef _KERNEL
+char   *MD5End __P((MD5_CTX *, char *));
+char   *MD5File __P((const char *, char *));
+char   *MD5Data __P((const unsigned char *, unsigned int, char *));
+#endif /* _KERNEL */
+__END_DECLS
+
+#endif /* _SYS_MD5_H_ */
diff -r 8ae672ddb679 -r 042501c8475a sys/sys/Makefile
--- a/sys/sys/Makefile  Mon Dec 11 20:05:33 2000 +0000
+++ b/sys/sys/Makefile  Mon Dec 11 21:05:14 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.24 2000/12/08 16:43:48 deberg Exp $
+#      $NetBSD: Makefile,v 1.25 2000/12/11 21:05:14 itojun Exp $
 
 KDIR=  /sys/sys
 INCSDIR= /usr/include/sys
@@ -26,7 +26,6 @@
 SYMLINKS= sys/exec_elf.h /usr/include/elf.h \
        sys/fcntl.h /usr/include/fcntl.h \
        sys/inttypes.h /usr/include/inttypes.h \
-       sys/md5.h /usr/include/md5.h \
        sys/poll.h /usr/include/poll.h \
        sys/sha1.h /usr/include/sha1.h \
        sys/syslog.h /usr/include/syslog.h \