merge from gcc
This commit is contained in:
parent
dc87f62014
commit
634e4f4ff8
@ -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>
|
2011-08-22 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
|
||||||
|
|
||||||
* aclocal.m4: Include ../config/picflag.m4.
|
* aclocal.m4: Include ../config/picflag.m4.
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/* md5.c - Functions to compute MD5 message digest of files or memory blocks
|
/* 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.
|
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
|
NOTE: This source is derived from an old version taken from the GNU C
|
||||||
Library (glibc).
|
Library (glibc).
|
||||||
@ -245,10 +245,12 @@ md5_process_bytes (const void *buffer, size_t len, struct md5_ctx *ctx)
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
#endif
|
#endif
|
||||||
|
{
|
||||||
md5_process_block (buffer, len & ~63, ctx);
|
md5_process_block (buffer, len & ~63, ctx);
|
||||||
buffer = (const void *) ((const char *) buffer + (len & ~63));
|
buffer = (const void *) ((const char *) buffer + (len & ~63));
|
||||||
len &= 63;
|
len &= 63;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* Move remaining bytes in internal buffer. */
|
/* Move remaining bytes in internal buffer. */
|
||||||
if (len > 0)
|
if (len > 0)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user