Merge branch 'maint'

diff --git a/ppc/sha1.c b/ppc/sha1.c
index 5ba4fc5259b063dab6417c142938d987ee894fc0..738e36c1e81def4822ccc2a66bc2761402a07f26 100644 (file)
--- a/ppc/sha1.c
+++ b/ppc/sha1.c
@@ -30,7 +30,7 @@ int SHA1_Update(SHA_CTX *c, const void *ptr, unsigned long n)
        unsigned long nb;
        const unsigned char *p = ptr;
 
-       c->len += n << 3;
+       c->len += (uint64_t) n << 3;
        while (n != 0) {
                if (c->cnt || n < 64) {
                        nb = 64 - c->cnt;
@@ -50,7 +50,7 @@ int SHA1_Update(SHA_CTX *c, const void *ptr, unsigned long n)
                p += nb;
        }
        return 0;
-}      
+}
 
 int SHA1_Final(unsigned char *hash, SHA_CTX *c)
 {