diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-08-15 20:49:45 +0200 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.de> | 2012-08-15 20:49:45 +0200 |
| commit | 02dcb6c5a240aa6c80ac55748a9ef88532427d06 (patch) | |
| tree | 85be77143fae324da39c15ba39123dc9bac07c77 /crypt/sha512.c | |
| parent | be75d758071ac8d87149c0e806fc96dd3d277696 (diff) | |
| download | glibc-02dcb6c5a240aa6c80ac55748a9ef88532427d06.tar.gz glibc-02dcb6c5a240aa6c80ac55748a9ef88532427d06.tar.xz glibc-02dcb6c5a240aa6c80ac55748a9ef88532427d06.zip | |
Fix BZ#14090 - md5/sha512 with large sizes
Diffstat (limited to 'crypt/sha512.c')
| -rw-r--r-- | crypt/sha512.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crypt/sha512.c b/crypt/sha512.c index 6e531c58ec..bec7bb3515 100644 --- a/crypt/sha512.c +++ b/crypt/sha512.c @@ -1,6 +1,6 @@ /* Functions to compute SHA512 message digest of files or memory blocks. according to the definition of SHA512 in FIPS 180-2. - Copyright (C) 2007, 2011 Free Software Foundation, Inc. + Copyright (C) 2007-2012 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 @@ -123,9 +123,10 @@ sha512_process_block (const void *buffer, size_t len, struct sha512_ctx *ctx) #ifdef USE_TOTAL128 ctx->total128 += len; #else - ctx->total[TOTAL128_low] += len; - if (ctx->total[TOTAL128_low] < len) - ++ctx->total[TOTAL128_high]; + uint64_t lolen = len; + ctx->total[TOTAL128_low] += lolen; + ctx->total[TOTAL128_high] += ((len >> 63 >> 1) + + (ctx->total[TOTAL128_low] < lolen)); #endif /* Process all bytes in the buffer with 128 bytes in each round of |