From 381f866e1635d4af57007040f4ce78381ef6db4c Mon Sep 17 00:00:00 2001
From: zrj <rimvydas.jasinskas@gmail.com>
Date: Mon, 24 Oct 2016 12:27:12 +0300
Subject: [PATCH] Unbreak buildkernel.

Follow up to 21137e2f155845448ff3979f5b05b12b642c40a2.
 * Update <sys/md5.h> to match sys/kern/md5c.c and lib/libmd/md5c.c.
 * Limit exposure of MD5 functions in kernel, only 3 are needed.

TBI: what about casts (void *) for *Init() in sys/opencrypto/xform.c ?
---
 lib/libmd/md5c.c |  3 +--
 sys/kern/md5c.c  | 10 +++++++---
 sys/sys/md5.h    | 10 ++++++----
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/lib/libmd/md5c.c b/lib/libmd/md5c.c
index 1f47f12c31..704076a30f 100644
--- a/lib/libmd/md5c.c
+++ b/lib/libmd/md5c.c
@@ -23,7 +23,6 @@
  * documentation and/or software.
  *
  * $FreeBSD: src/lib/libmd/md5c.c,v 1.17 2006/01/17 15:35:56 phk Exp $
- * $DragonFly: src/lib/libmd/md5c.c,v 1.5 2008/09/30 16:57:05 swildner Exp $
  *
  * This code is the same as the code published by RSA Inc.  It has been
  * edited for clarity and style only.
@@ -51,7 +50,7 @@ static void MD5Transform(u_int32_t [4], const unsigned char [64]);
 #if (BYTE_ORDER == LITTLE_ENDIAN)
 #define Encode memcpy
 #define Decode memcpy
-#else 
+#else
 
 /*
  * Encodes input (u_int32_t) into output (unsigned char). Assumes len is
diff --git a/sys/kern/md5c.c b/sys/kern/md5c.c
index 27e14ff807..62e3244868 100644
--- a/sys/kern/md5c.c
+++ b/sys/kern/md5c.c
@@ -23,12 +23,14 @@
  * documentation and/or software.
  *
  * $FreeBSD: src/sys/kern/md5c.c,v 1.27 2006/03/30 18:45:50 pjd Exp $
- * $DragonFly: src/sys/kern/md5c.c,v 1.5 2008/09/11 20:25:34 swildner Exp $
  *
  * This code is the same as the code published by RSA Inc.  It has been
  * edited for clarity and style only.
  */
 
+/*
+ * This file should be kept in sync with src/lib/libmd/md5c.c
+ */
 #include <sys/types.h>
 
 #ifdef _KERNEL
@@ -41,6 +43,8 @@
 #include <sys/endian.h>
 #include <sys/md5.h>
 
+static void MD5Transform(u_int32_t [4], const unsigned char [64]);
+
 #if (BYTE_ORDER == LITTLE_ENDIAN)
 #define Encode memcpy
 #define Decode memcpy
@@ -184,7 +188,7 @@ MD5Update (MD5_CTX *context, const void *in, unsigned int inputLen)
  * MD5 padding. Adds padding followed by original length.
  */
 
-void
+static void
 MD5Pad (MD5_CTX *context)
 {
 	unsigned char bits[8];
@@ -222,7 +226,7 @@ MD5Final (unsigned char digest[16], MD5_CTX *context)
 
 /* MD5 basic transformation. Transforms state based on block. */
 
-void
+static void
 MD5Transform (u_int32_t state[4], const unsigned char block[64])
 {
 	u_int32_t a = state[0], b = state[1], c = state[2], d = state[3], x[16];
diff --git a/sys/sys/md5.h b/sys/sys/md5.h
index 381c6f98a4..784d556bf7 100644
--- a/sys/sys/md5.h
+++ b/sys/sys/md5.h
@@ -1,6 +1,5 @@
 /* MD5.H - header file for MD5C.C
  * $FreeBSD: src/sys/sys/md5.h,v 1.20 2006/03/15 19:47:12 andre Exp $
- * $DragonFly: src/sys/sys/md5.h,v 1.5 2008/09/11 20:25:34 swildner Exp $
  */
 
 /*-
@@ -47,16 +46,19 @@ typedef struct MD5Context {
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
+#ifdef _KERNEL
+void  MD5Init (MD5_CTX *);
+#else
 int   MD5Init (MD5_CTX *);
+#endif
 void   MD5Update (MD5_CTX *, const void *, unsigned int);
-void   MD5Pad (MD5_CTX *);
 void   MD5Final (unsigned char [16], MD5_CTX *);
+#ifndef _KERNEL
+void   MD5Pad(MD5_CTX *);
 char * MD5End(MD5_CTX *, char *);
 char * MD5File(const char *, char *);
 char * MD5FileChunk(const char *, char *, off_t, off_t);
 char * MD5Data(const void *, unsigned int, char *);
-#ifdef _KERNEL
-void MD5Transform (u_int32_t [4], const unsigned char [64]);
 #endif
 __END_DECLS
 
-- 
2.41.0