summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--crypt/md5.c5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 980c5091b9..b6ab53e31b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-02 Roland McGrath <roland@redhat.com>
+
+ [BZ #924]
+ * crypt/md5.c [! HAVE_MEMCPY] (memcpy): Yield proper expression value.
+
2005-04-29 Roland McGrath <roland@redhat.com>
* timezone/africa: Update from tzdata2005i.
diff --git a/crypt/md5.c b/crypt/md5.c
index 04bce5ab37..922e7cc7e9 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