diff --git a/src/lib/libc/hash/md4.c b/src/lib/libc/hash/md4.c
index da92290c..a1006dbf 100644
--- a/src/lib/libc/hash/md4.c
+++ b/src/lib/libc/hash/md4.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: md4.c,v 1.4 2004/05/03 17:30:14 millert Exp $	*/
+/*	$OpenBSD: md4.c,v 1.5 2004/05/03 18:07:07 millert Exp $	*/
 
 /*
  * This code implements the MD4 message-digest algorithm.
@@ -19,7 +19,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$OpenBSD: md4.c,v 1.4 2004/05/03 17:30:14 millert Exp $";
+static const char rcsid[] = "$OpenBSD: md4.c,v 1.5 2004/05/03 18:07:07 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -42,7 +42,7 @@ static const char rcsid[] = "$OpenBSD: md4.c,v 1.4 2004/05/03 17:30:14 millert E
 	(cp)[1] = (value) >> 8;						\
 	(cp)[0] = (value); } while (0)
 
-static u_char PADDING[MD4_BLOCK_LENGTH] = {
+static u_int8_t PADDING[MD4_BLOCK_LENGTH] = {
 	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
diff --git a/src/lib/libc/hash/md5.c b/src/lib/libc/hash/md5.c
index c7d8a96d..85e71d81 100644
--- a/src/lib/libc/hash/md5.c
+++ b/src/lib/libc/hash/md5.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: md5.c,v 1.5 2004/05/03 17:30:14 millert Exp $	*/
+/*	$OpenBSD: md5.c,v 1.6 2004/05/03 18:07:07 millert Exp $	*/
 
 /*
  * This code implements the MD5 message-digest algorithm.
@@ -18,7 +18,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$OpenBSD: md5.c,v 1.5 2004/05/03 17:30:14 millert Exp $";
+static const char rcsid[] = "$OpenBSD: md5.c,v 1.6 2004/05/03 18:07:07 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -41,7 +41,7 @@ static const char rcsid[] = "$OpenBSD: md5.c,v 1.5 2004/05/03 17:30:14 millert E
 	(cp)[1] = (value) >> 8;						\
 	(cp)[0] = (value); } while (0)
 
-static u_char PADDING[MD5_BLOCK_LENGTH] = {
+static u_int8_t PADDING[MD5_BLOCK_LENGTH] = {
 	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
diff --git a/src/lib/libc/hash/rmd160.c b/src/lib/libc/hash/rmd160.c
index 3da1781c..bea97614 100644
--- a/src/lib/libc/hash/rmd160.c
+++ b/src/lib/libc/hash/rmd160.c
@@ -32,7 +32,7 @@
 #include <rmd160.h>
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static char rcsid[] = "$OpenBSD: rmd160.c,v 1.15 2004/05/03 17:30:15 millert Exp $";
+static char rcsid[] = "$OpenBSD: rmd160.c,v 1.16 2004/05/03 18:07:07 millert Exp $";
 #endif /* LIBC_SCCS and not lint */
 
 #define PUT_64BIT_LE(cp, value) do {                                    \
@@ -86,7 +86,7 @@ static char rcsid[] = "$OpenBSD: rmd160.c,v 1.15 2004/05/03 17:30:15 millert Exp
 
 #define X(i)	x[i]
 
-static u_char PADDING[RMD160_BLOCK_LENGTH] = {
+static u_int8_t PADDING[RMD160_BLOCK_LENGTH] = {
 	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
@@ -104,7 +104,7 @@ RMD160Init(RMD160_CTX *ctx)
 }
 
 void
-RMD160Update(RMD160_CTX *ctx, const u_char *input, size_t len)
+RMD160Update(RMD160_CTX *ctx, const u_int8_t *input, size_t len)
 {
 	size_t have, off, need;
 
@@ -150,7 +150,7 @@ RMD160Pad(RMD160_CTX *ctx)
 }
 
 void
-RMD160Final(u_char digest[RMD160_DIGEST_LENGTH], RMD160_CTX *ctx)
+RMD160Final(u_int8_t digest[RMD160_DIGEST_LENGTH], RMD160_CTX *ctx)
 {
 	int i;
 
@@ -163,7 +163,7 @@ RMD160Final(u_char digest[RMD160_DIGEST_LENGTH], RMD160_CTX *ctx)
 }
 
 void
-RMD160Transform(u_int32_t state[5], const u_char block[RMD160_BLOCK_LENGTH])
+RMD160Transform(u_int32_t state[5], const u_int8_t block[RMD160_BLOCK_LENGTH])
 {
 	u_int32_t a, b, c, d, e, aa, bb, cc, dd, ee, t, x[16];