4 files changed, 12 insertions, 9 deletions
diff --git a/crypt/Makefile b/crypt/Makefile
index af088f1..575221a 100644
--- a/crypt/Makefile
+++ b/crypt/Makefile
@@ -23,17 +23,15 @@ subdir	:= crypt
 
 headers := crypt.h
 
-distribute := md5.h
-
 extra-libs := libcrypt
 extra-libs-others := $(extra-libs)
 
 libcrypt-routines := crypt-entry md5-crypt md5 crypt crypt_util
 
-tests = cert md5test md5c-test
+tests := cert md5test md5c-test
 
-distribute = ufc-crypt.h crypt-private.h ufc.c speeds.c README.ufc-crypt \
-	     Banner md5.h
+distribute := ufc-crypt.h crypt-private.h ufc.c speeds.c README.ufc-crypt \
+	      Banner md5.h
 
 include ../Makeconfig
 
diff --git a/crypt/crypt_util.c b/crypt/crypt_util.c
index 5467a97..0db5be7 100644
--- a/crypt/crypt_util.c
+++ b/crypt/crypt_util.c
@@ -902,7 +902,7 @@ __setkey_r(__key, __data)
       c = c << 1 | *__key++;
     ktab[i] = c >> 1;
   }
-  _ufc_mk_keytab_r(ktab, __data);
+  _ufc_mk_keytab_r((char *) ktab, __data);
 }
 weak_alias (__setkey_r, setkey_r)
 
diff --git a/crypt/md5.c b/crypt/md5.c
index 04bce5a..922e7cc 100644
--- a/crypt/md5.c
+++ b/crypt/md5.c
@@ -1,6 +1,7 @@
 /* Functions to compute MD5 message digest of files or memory blocks.
    according to the definition of MD5 in RFC 1321 from April 1992.
-   Copyright (C) 1995,1996,1997,1999,2000,2001 Free Software Foundation, Inc.
+   Copyright (C) 1995,1996,1997,1999,2000,2001,2005
+	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -31,7 +32,7 @@
 # include <string.h>
 #else
 # ifndef HAVE_MEMCPY
-#  define memcpy(d, s, n) bcopy ((s), (d), (n))
+#  define memcpy(d, s, n) (bcopy ((s), (d), (n)), (d))
 # endif
 #endif
 
diff --git a/crypt/md5.h b/crypt/md5.h
index 35088f2..b474a84 100644
--- a/crypt/md5.h
+++ b/crypt/md5.h
@@ -1,6 +1,7 @@
 /* Declaration of functions and data types used for MD5 sum computing
    library functions.
-   Copyright (C) 1995-1997,1999,2000,2001,2004 Free Software Foundation, Inc.
+   Copyright (C) 1995-1997,1999,2000,2001,2004,2005
+      Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -27,6 +28,9 @@
 # include <limits.h>
 #endif
 
+#define MD5_DIGEST_SIZE 16
+#define MD5_BLOCK_SIZE 64
+
 /* The following contortions are an attempt to use the C preprocessor
    to determine an unsigned integral type that is 32 bits wide.  An
    alternative approach is to use autoconf's AC_CHECK_SIZEOF macro, but