Update to zlib 1.2.3; OK deraadt@

1 files changed, 9 insertions, 3 deletions

diff --git a/lib/libz/deflate.h b/lib/libz/deflate.h
index aa8dd90675b..8763c406e4c 100644
--- a/lib/libz/deflate.h
+++ b/lib/libz/deflate.h
@@ -1,6 +1,6 @@
-/*	$OpenBSD: deflate.h,v 1.6 2004/12/03 03:06:36 djm Exp $	*/
+/*	$OpenBSD: deflate.h,v 1.7 2005/07/20 15:56:41 millert Exp $	*/
 /* deflate.h -- internal compression state
- * Copyright (C) 1995-2002 Jean-loup Gailly
+ * Copyright (C) 1995-2004 Jean-loup Gailly
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
@@ -49,6 +49,10 @@
 /* All codes must not exceed MAX_BITS bits */
 
 #define INIT_STATE    42
+#define EXTRA_STATE   69
+#define NAME_STATE    73
+#define COMMENT_STATE 91
+#define HCRC_STATE   103
 #define BUSY_STATE   113
 #define FINISH_STATE 666
 /* Stream status */
@@ -93,8 +97,10 @@ typedef struct internal_state {
     Bytef *pending_buf;  /* output still pending */
     ulg   pending_buf_size; /* size of pending_buf */
     Bytef *pending_out;  /* next pending byte to output to the stream */
-    int   pending;       /* nb of bytes in the pending buffer */
+    uInt   pending;      /* nb of bytes in the pending buffer */
     int   wrap;          /* bit 0 true for zlib, bit 1 true for gzip */
+    gz_headerp  gzhead;  /* gzip header information to write */
+    uInt   gzindex;      /* where in extra, name, or comment */
     Byte  method;        /* STORED (for zip only) or DEFLATED */
     int   last_flush;    /* value of flush param for previous deflate call */