This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.16-ports-merge-195-gdd924cd
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 15 Aug 2012 21:02:28 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.16-ports-merge-195-gdd924cd
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via dd924cd7cc3ef8c9da103d883dd784815e388976 (commit)
from 1afbc875e31e87c2eb8a0cdaf48bc36d3edb363d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=dd924cd7cc3ef8c9da103d883dd784815e388976
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
crypt/sha512.c | 2 +-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 41aacc8..66a0b71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-15 Roland McGrath <roland@hack.frob.com>
+
+ * crypt/sha512.c (sha512_process_block) [!USE_TOTAL128]: Avoid
+ shifting LEN more than 31 bits at once.
+
2012-08-15 Liubov Dmitrieva <liubov.dmitrieva@gmail.com>
[BZ #14195]
diff --git a/crypt/sha512.c b/crypt/sha512.c
index bec7bb3..0675c94 100644
--- a/crypt/sha512.c
+++ b/crypt/sha512.c
@@ -125,7 +125,7 @@ sha512_process_block (const void *buffer, size_t len, struct sha512_ctx *ctx)
#else
uint64_t lolen = len;
ctx->total[TOTAL128_low] += lolen;
- ctx->total[TOTAL128_high] += ((len >> 63 >> 1)
+ ctx->total[TOTAL128_high] += ((len >> 31 >> 31 >> 2)
+ (ctx->total[TOTAL128_low] < lolen));
#endif
hooks/post-receive
--
GNU C Library master sources