[Midnightbsd-cvs] src [12373] trunk/sys/sys: Sync with FreeBSD 11-stable

[laffer1 at midnightbsd.org]

Revision: 12373
          http://svnweb.midnightbsd.org/src/?rev=12373
Author:   laffer1
Date:     2020-02-16 17:29:26 -0500 (Sun, 16 Feb 2020)
Log Message:
-----------
Sync with FreeBSD 11-stable

Modified Paths:
--------------
    trunk/sys/sys/md4.h
    trunk/sys/sys/md5.h

Modified: trunk/sys/sys/md4.h
===================================================================
--- trunk/sys/sys/md4.h	2020-02-16 22:28:12 UTC (rev 12372)
+++ trunk/sys/sys/md4.h	2020-02-16 22:29:26 UTC (rev 12373)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
 /* MD4.H - header file for MD4C.C
- * $MidnightBSD$
+ * $FreeBSD: stable/11/sys/sys/md4.h 309023 2016-11-22 20:28:17Z asomers $
  */
 
 /*-
@@ -39,10 +40,12 @@
 void   MD4Init(MD4_CTX *);
 void   MD4Update(MD4_CTX *, const unsigned char *, unsigned int);
 void   MD4Pad(MD4_CTX *);
-void   MD4Final(unsigned char [16], MD4_CTX *);
+void   MD4Final(unsigned char [__min_size(16)], MD4_CTX *);
+#ifndef _KERNEL
 char * MD4End(MD4_CTX *, char *);
 char * MD4File(const char *, char *);
 char * MD4Data(const unsigned char *, unsigned int, char *);
+#endif
 __END_DECLS
 
 #endif /* _MD4_H_ */

Modified: trunk/sys/sys/md5.h
===================================================================
--- trunk/sys/sys/md5.h	2020-02-16 22:28:12 UTC (rev 12372)
+++ trunk/sys/sys/md5.h	2020-02-16 22:29:26 UTC (rev 12373)
@@ -1,5 +1,6 @@
+/* $MidnightBSD$ */
 /* MD5.H - header file for MD5C.C
- * $MidnightBSD$
+ * $FreeBSD: stable/11/sys/sys/md5.h 310372 2016-12-21 18:42:04Z emaste $
  */
 
 /*-
@@ -44,10 +45,14 @@
 __BEGIN_DECLS
 void   MD5Init (MD5_CTX *);
 void   MD5Update (MD5_CTX *, const void *, unsigned int);
-void   MD5Final (unsigned char [16], MD5_CTX *);
+void   MD5Final (unsigned char[__min_size(MD5_DIGEST_LENGTH)], MD5_CTX *);
+#ifndef _KERNEL
 char * MD5End(MD5_CTX *, char *);
+char * MD5Fd(int, char *);
+char * MD5FdChunk(int, char *, off_t, off_t);
 char * MD5File(const char *, char *);
 char * MD5FileChunk(const char *, char *, off_t, off_t);
 char * MD5Data(const void *, unsigned int, char *);
+#endif
 __END_DECLS
 #endif /* _SYS_MD5_H_ */