VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Common/zlib/inflate.h
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2017-04-25 23:39:48 +0200
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2017-04-26 00:20:16 +0200
commit9270952b3dd956ba2f6b2e444768354bee3ae5e2 (patch)
tree90a37d06fb3e86255c4f605c47e546e2a9ce07ee /src/Common/zlib/inflate.h
parent371b9c904aef37863aa57e2e848915df9ba9da9b (diff)
downloadVeraCrypt-9270952b3dd956ba2f6b2e444768354bee3ae5e2.tar.gz
VeraCrypt-9270952b3dd956ba2f6b2e444768354bee3ae5e2.zip
Windows: update zlib to version 1.2.11
Diffstat (limited to 'src/Common/zlib/inflate.h')
-rw-r--r--src/Common/zlib/inflate.h11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/Common/zlib/inflate.h b/src/Common/zlib/inflate.h
index 95f4986d..a46cce6b 100644
--- a/src/Common/zlib/inflate.h
+++ b/src/Common/zlib/inflate.h
@@ -1,5 +1,5 @@
/* inflate.h -- internal inflate state definition
- * Copyright (C) 1995-2009 Mark Adler
+ * Copyright (C) 1995-2016 Mark Adler
* For conditions of distribution and use, see copyright notice in zlib.h
*/
@@ -18,7 +18,7 @@
/* Possible inflate modes between inflate() calls */
typedef enum {
- HEAD, /* i: waiting for magic header */
+ HEAD = 16180, /* i: waiting for magic header */
FLAGS, /* i: waiting for method and flags (gzip) */
TIME, /* i: waiting for modification time (gzip) */
OS, /* i: waiting for extra flags and operating system (gzip) */
@@ -77,11 +77,14 @@ typedef enum {
CHECK -> LENGTH -> DONE
*/
-/* state maintained between inflate() calls. Approximately 10K bytes. */
+/* State maintained between inflate() calls -- approximately 7K bytes, not
+ including the allocated sliding window, which is up to 32K bytes. */
struct inflate_state {
+ z_streamp strm; /* pointer back to this zlib stream */
inflate_mode mode; /* current inflate mode */
int last; /* true if processing last block */
- int wrap; /* bit 0 true for zlib, bit 1 true for gzip */
+ int wrap; /* bit 0 true for zlib, bit 1 true for gzip,
+ bit 2 true to validate check value */
int havedict; /* true if dictionary provided */
int flags; /* gzip header method and flags (0 if zlib) */
unsigned dmax; /* zlib header max distance (INFLATE_STRICT) */