diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2017-04-25 23:39:48 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2017-04-26 00:20:16 +0200 |
| commit | 9270952b3dd956ba2f6b2e444768354bee3ae5e2 (patch) | |
| tree | 90a37d06fb3e86255c4f605c47e546e2a9ce07ee /src/Common/zlib/adler32.c | |
| parent | 371b9c904aef37863aa57e2e848915df9ba9da9b (diff) | |
| download | VeraCrypt-9270952b3dd956ba2f6b2e444768354bee3ae5e2.tar.gz VeraCrypt-9270952b3dd956ba2f6b2e444768354bee3ae5e2.zip | |
Windows: update zlib to version 1.2.11
Diffstat (limited to 'src/Common/zlib/adler32.c')
| -rw-r--r-- | src/Common/zlib/adler32.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/Common/zlib/adler32.c b/src/Common/zlib/adler32.c index a868f073..d0be4380 100644 --- a/src/Common/zlib/adler32.c +++ b/src/Common/zlib/adler32.c @@ -1,5 +1,5 @@ /* adler32.c -- compute the Adler-32 checksum of a data stream - * Copyright (C) 1995-2011 Mark Adler + * Copyright (C) 1995-2011, 2016 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -7,11 +7,9 @@ #include "zutil.h" -#define local static - local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2)); -#define BASE 65521 /* largest prime smaller than 65536 */ +#define BASE 65521U /* largest prime smaller than 65536 */ #define NMAX 5552 /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */ @@ -62,10 +60,10 @@ local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2)); #endif /* ========================================================================= */ -uLong ZEXPORT adler32(adler, buf, len) +uLong ZEXPORT adler32_z(adler, buf, len) uLong adler; const Bytef *buf; - uInt len; + z_size_t len; { unsigned long sum2; unsigned n; @@ -133,6 +131,15 @@ uLong ZEXPORT adler32(adler, buf, len) } /* ========================================================================= */ +uLong ZEXPORT adler32(adler, buf, len) + uLong adler; + const Bytef *buf; + uInt len; +{ + return adler32_z(adler, buf, len); +} + +/* ========================================================================= */ local uLong adler32_combine_(adler1, adler2, len2) uLong adler1; uLong adler2; @@ -156,7 +163,7 @@ local uLong adler32_combine_(adler1, adler2, len2) sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem; if (sum1 >= BASE) sum1 -= BASE; if (sum1 >= BASE) sum1 -= BASE; - if (sum2 >= (BASE << 1)) sum2 -= (BASE << 1); + if (sum2 >= ((unsigned long)BASE << 1)) sum2 -= ((unsigned long)BASE << 1); if (sum2 >= BASE) sum2 -= BASE; return sum1 | (sum2 << 16); } |