diff options
| author | DJ Delorie <dj@redhat.com> | 2011-09-23 20:01:11 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2011-09-23 20:01:11 +0000 |
| commit | 634e4f4ff80a302d103a4516b6921039d7af7688 (patch) | |
| tree | 2cdb82fadd9503ff7e8b0654cfe4fefa685c73a9 /libiberty | |
| parent | dc87f6201460bb5564a94d3c84beb4ab87a9962d (diff) | |
| download | gdb-634e4f4ff80a302d103a4516b6921039d7af7688.zip gdb-634e4f4ff80a302d103a4516b6921039d7af7688.tar.gz gdb-634e4f4ff80a302d103a4516b6921039d7af7688.tar.bz2 | |
merge from gcc
Diffstat (limited to 'libiberty')
| -rw-r--r-- | libiberty/ChangeLog | 5 | ||||
| -rw-r--r-- | libiberty/md5.c | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 844b1ee..672d0ec 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,8 @@ +2011-09-23 Ian Lance Taylor <iant@google.com> + + * md5.c (md5_process_bytes): Correct handling of unaligned + buffer. + 2011-08-22 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> * aclocal.m4: Include ../config/picflag.m4. diff --git a/libiberty/md5.c b/libiberty/md5.c index 11920e1..0db8fc8 100644 --- a/libiberty/md5.c +++ b/libiberty/md5.c @@ -1,6 +1,6 @@ /* md5.c - 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 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 2011 Free Software Foundation, Inc. NOTE: This source is derived from an old version taken from the GNU C Library (glibc). @@ -245,9 +245,11 @@ md5_process_bytes (const void *buffer, size_t len, struct md5_ctx *ctx) } else #endif - md5_process_block (buffer, len & ~63, ctx); - buffer = (const void *) ((const char *) buffer + (len & ~63)); - len &= 63; + { + md5_process_block (buffer, len & ~63, ctx); + buffer = (const void *) ((const char *) buffer + (len & ~63)); + len &= 63; + } } /* Move remaining bytes in internal buffer. */ |