src - OpenBSD base system

diff options


context:
space:
mode:

author	Damien Miller <djm@cvs.openbsd.org>	2004-12-03 03:07:10 +0000
committer	Damien Miller <djm@cvs.openbsd.org>	2004-12-03 03:07:10 +0000
commit	dad29962ca3f89344ac972180cab5a6e99472f77 (patch)
tree	704705796f710d79b82d233ef44353891300dbaa /sys
parent	d96931260dc21ceb4f8d4e37df6f2bc6a29f98d4 (diff)

zlib-1.21 here too

Diffstat (limited to 'sys')

-rw-r--r--

sys/lib/libz/crc32.c

-rw-r--r--

sys/lib/libz/infback.c

-rw-r--r--

sys/lib/libz/inffast.c

-rw-r--r--

sys/lib/libz/inflate.c

-rw-r--r--

sys/lib/libz/inftrees.c

-rw-r--r--

sys/lib/libz/zconf.h

-rw-r--r--

sys/lib/libz/zlib.h

-rw-r--r--

sys/lib/libz/zutil.h

8 files changed, 136 insertions, 98 deletions

diff --git a/sys/lib/libz/crc32.c b/sys/lib/libz/crc32.c
index 69118d83050..6240e6e0e2b 100644
--- a/sys/lib/libz/crc32.c
+++ b/sys/lib/libz/crc32.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: crc32.c,v 1.9 2003/12/16 23:57:48 millert Exp $ */

+/* $OpenBSD: crc32.c,v 1.10 2004/12/03 03:07:09 djm Exp $ */

/* crc32.c -- compute the CRC-32 of a data stream

* For conditions of distribution and use, see copyright notice in zlib.h

@@ -10,6 +10,14 @@

* of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3.

+/*

+ Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore

+ protection on the static variables used to control the first-use generation

+ of the crc tables. Therefore, if you #define DYNAMIC_CRC_TABLE, you should

+ first call get_crc_table() to initialize the tables before allowing more than

+ one thread to use crc32().

+ */

#ifdef MAKECRCH

# include <stdio.h>

# ifndef DYNAMIC_CRC_TABLE

@@ -57,7 +65,7 @@

#ifdef DYNAMIC_CRC_TABLE

-local int crc_table_empty = 1;

+local volatile int crc_table_empty = 1;

local unsigned long FAR crc_table[TBLS][256];

local void make_crc_table OF((void));

#ifdef MAKECRCH

@@ -94,38 +102,51 @@ local void make_crc_table()

{

unsigned long c;

int n, k;

- unsigned long poly; /* polynomial exclusive-or pattern */

+ unsigned long poly; /* polynomial exclusive-or pattern */

/* terms of polynomial defining this crc (except x^32): */

+ static volatile int first = 1; /* flag to limit concurrent making */

static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};

- /* make exclusive-or pattern from polynomial (0xedb88320UL) */

- poly = 0UL;

- for (n = 0; n < sizeof(p)/sizeof(unsigned char); n++)

- poly |= 1UL << (31 - p[n]);

- /* generate a crc for every 8-bit value */

- for (n = 0; n < 256; n++) {

- c = (unsigned long)n;

- for (k = 0; k < 8; k++)

- c = c & 1 ? poly ^ (c >> 1) : c >> 1;

- crc_table[0][n] = c;

- }

+ /* See if another task is already doing this (not thread-safe, but better

+ than nothing -- significantly reduces duration of vulnerability in

+ case the advice about DYNAMIC_CRC_TABLE is ignored) */

+ if (first) {

+ first = 0;

+ /* make exclusive-or pattern from polynomial (0xedb88320UL) */

+ poly = 0UL;

+ for (n = 0; n < sizeof(p)/sizeof(unsigned char); n++)

+ poly |= 1UL << (31 - p[n]);

+ /* generate a crc for every 8-bit value */

+ for (n = 0; n < 256; n++) {

+ c = (unsigned long)n;

+ for (k = 0; k < 8; k++)

+ c = c & 1 ? poly ^ (c >> 1) : c >> 1;

+ crc_table[0][n] = c;

+ }

#ifdef BYFOUR

- /* generate crc for each value followed by one, two, and three zeros, and

- then the byte reversal of those as well as the first table */

- for (n = 0; n < 256; n++) {

- c = crc_table[0][n];

- crc_table[4][n] = REV(c);

- for (k = 1; k < 4; k++) {

- c = crc_table[0][c & 0xff] ^ (c >> 8);

- crc_table[k][n] = c;

- crc_table[k + 4][n] = REV(c);

+ /* generate crc for each value followed by one, two, and three zeros,

+ and then the byte reversal of those as well as the first table */

+ for (n = 0; n < 256; n++) {

+ c = crc_table[0][n];

+ crc_table[4][n] = REV(c);

+ for (k = 1; k < 4; k++) {

+ c = crc_table[0][c & 0xff] ^ (c >> 8);

+ crc_table[k][n] = c;

+ crc_table[k + 4][n] = REV(c);

+ }

}

- }

#endif /* BYFOUR */

- crc_table_empty = 0;

+ crc_table_empty = 0;

+ }

+ else { /* not first */

+ /* wait for the other guy to finish (not efficient, but rare) */

+ while (crc_table_empty)

+ ;

+ }

#ifdef MAKECRCH

/* write out CRC tables to crc32.h */

@@ -179,9 +200,10 @@ local void write_table(out, table)

const unsigned long FAR * ZEXPORT get_crc_table()

{

#ifdef DYNAMIC_CRC_TABLE

- if (crc_table_empty) make_crc_table();

+ if (crc_table_empty)

+ make_crc_table();

#endif /* DYNAMIC_CRC_TABLE */

- return (const unsigned long FAR *)crc_table;

+ return (const unsigned long FAR *)crc_table;

}

/* ========================================================================= */

diff --git a/sys/lib/libz/infback.c b/sys/lib/libz/infback.c
index 52c42db6c60..b6814b2bd8a 100644
--- a/sys/lib/libz/infback.c
+++ b/sys/lib/libz/infback.c

@@ -446,8 +446,8 @@ void FAR *out_desc;

}

- if (state->mode == BAD)

- break;

+ /* handle error breaks in while */

+ if (state->mode == BAD) break;

/* build code tables */

state->next = state->codes;

diff --git a/sys/lib/libz/inffast.c b/sys/lib/libz/inffast.c
index 982239effb4..bd5169458d5 100644
--- a/sys/lib/libz/inffast.c
+++ b/sys/lib/libz/inffast.c

@@ -1,6 +1,6 @@

-/* $OpenBSD: inffast.c,v 1.9 2003/12/16 23:58:30 millert Exp $ */

+/* $OpenBSD: inffast.c,v 1.10 2004/12/03 03:07:09 djm Exp $ */

/* inffast.c -- fast decoding

* For conditions of distribution and use, see copyright notice in zlib.h

@@ -20,7 +20,7 @@

- none

No measurable difference:

- Pentium III (Anderson)

- - 68060 (Nikl)

+ - M68060 (Nikl)

#ifdef POSTINC

# define OFF 0

diff --git a/sys/lib/libz/inflate.c b/sys/lib/libz/inflate.c
index ee178ff7db3..7843d537667 100644
--- a/sys/lib/libz/inflate.c
+++ b/sys/lib/libz/inflate.c

@@ -1,4 +1,4 @@

-/* $OpenBSD: inflate.c,v 1.11 2004/08/26 18:39:18 otto Exp $ */

+/* $OpenBSD: inflate.c,v 1.12 2004/12/03 03:07:09 djm Exp $ */

/* inflate.c -- zlib decompression

* For conditions of distribution and use, see copyright notice in zlib.h

@@ -110,6 +110,7 @@ z_streamp strm;

state = (struct inflate_state FAR *)strm->state;

strm->total_in = strm->total_out = state->total = 0;

strm->msg = Z_NULL;

+ strm->adler = 1; /* to support ill-conceived Java test suite */

state->mode = HEAD;

state->last = 0;

state->havedict = 0;

@@ -913,8 +914,8 @@ int flush;

}

- if (state->mode == BAD)

- break;

+ /* handle error breaks in while */

+ if (state->mode == BAD) break;

/* build code tables */

state->next = state->codes;

diff --git a/sys/lib/libz/inftrees.c b/sys/lib/libz/inftrees.c
index 542f300e1eb..ba3507df1ba 100644
--- a/sys/lib/libz/inftrees.c
+++ b/sys/lib/libz/inftrees.c

@@ -1,6 +1,6 @@

-/* $OpenBSD: inftrees.c,v 1.11 2003/12/16 23:57:48 millert Exp $ */

+/* $OpenBSD: inftrees.c,v 1.12 2004/12/03 03:07:09 djm Exp $ */

/* inftrees.c -- generate Huffman trees for efficient decoding

* For conditions of distribution and use, see copyright notice in zlib.h

@@ -10,7 +10,7 @@

#define MAXBITS 15

const char inflate_copyright[] =

If you use the zlib library in a product, an acknowledgment is welcome

in the documentation of your product. If for some reason you cannot

@@ -63,7 +63,7 @@ unsigned short FAR *work;

35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};

static const unsigned short lext[31] = { /* Length codes 257..285 extra */

16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18,

- 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 76, 66};

+ 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 199, 198};

static const unsigned short dbase[32] = { /* Distance codes 0..29 base */

1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,

257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,

@@ -115,7 +115,15 @@ unsigned short FAR *work;

for (max = MAXBITS; max >= 1; max--)

if (count[max] != 0) break;

if (root > max) root = max;

- if (max == 0) return -1; /* no codes! */

+ if (max == 0) { /* no symbols to code at all */

+ this.op = (unsigned char)64; /* invalid code marker */

+ this.bits = (unsigned char)1;

+ this.val = (unsigned short)0;

+ *(*table)++ = this; /* make a table to force an error */

+ *(*table)++ = this;

+ *bits = 1;

+ return 0; /* no symbols, but wait for decoding to report error */

+ }

for (min = 1; min <= MAXBITS; min++)

if (count[min] != 0) break;

if (root < min) root = min;

@@ -296,7 +304,6 @@ unsigned short FAR *work;

drop = 0;

len = root;

next = *table;

- curr = root;

this.bits = (unsigned char)len;

}

diff --git a/sys/lib/libz/zconf.h b/sys/lib/libz/zconf.h
index 49beebb1c8e..0ccb9fd9632 100644
--- a/sys/lib/libz/zconf.h
+++ b/sys/lib/libz/zconf.h

@@ -1,6 +1,6 @@

-/* $OpenBSD: zconf.h,v 1.8 2003/12/16 23:58:30 millert Exp $ */

+/* $OpenBSD: zconf.h,v 1.9 2004/12/03 03:07:09 djm Exp $ */

/* zconf.h -- configuration of the zlib compression library

* For conditions of distribution and use, see copyright notice in zlib.h

@@ -13,43 +13,46 @@

* compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.

#ifdef Z_PREFIX

-# define deflateInit_ z_deflateInit_

-# define deflate z_deflate

-# define deflateEnd z_deflateEnd

-# define inflateInit_ z_inflateInit_

-# define inflate z_inflate

-# define inflateEnd z_inflateEnd

-# define deflateInit2_ z_deflateInit2_

-# define deflateSetDictionary z_deflateSetDictionary

-# define deflateCopy z_deflateCopy

-# define deflateReset z_deflateReset

-# define deflatePrime z_deflatePrime

-# define deflateParams z_deflateParams

-# define deflateBound z_deflateBound

-# define inflateInit2_ z_inflateInit2_

-# define inflateSetDictionary z_inflateSetDictionary

-# define inflateSync z_inflateSync

-# define inflateSyncPoint z_inflateSyncPoint

-# define inflateCopy z_inflateCopy

-# define inflateReset z_inflateReset

-# define compress z_compress

-# define compress2 z_compress2

-# define compressBound z_compressBound

-# define uncompress z_uncompress

-# define adler32 z_adler32

-# define crc32 z_crc32

-# define get_crc_table z_get_crc_table

+# define deflateInit_ z_deflateInit_

+# define deflate z_deflate

+# define deflateEnd z_deflateEnd

+# define inflateInit_ z_inflateInit_

+# define inflate z_inflate

+# define inflateEnd z_inflateEnd

+# define deflateInit2_ z_deflateInit2_

+# define deflateSetDictionary z_deflateSetDictionary

+# define deflateCopy z_deflateCopy

+# define deflateReset z_deflateReset

+# define deflateParams z_deflateParams

+# define deflateBound z_deflateBound

+# define deflatePrime z_deflatePrime

+# define inflateInit2_ z_inflateInit2_

+# define inflateSetDictionary z_inflateSetDictionary

+# define inflateSync z_inflateSync

+# define inflateSyncPoint z_inflateSyncPoint

+# define inflateCopy z_inflateCopy

+# define inflateReset z_inflateReset

+# define inflateBack z_inflateBack

+# define inflateBackEnd z_inflateBackEnd

+# define compress z_compress

+# define compress2 z_compress2

+# define compressBound z_compressBound

+# define uncompress z_uncompress

+# define adler32 z_adler32

+# define crc32 z_crc32

+# define get_crc_table z_get_crc_table

+# define zError z_zError

-# define Byte z_Byte

-# define uInt z_uInt

-# define uLong z_uLong

-# define Bytef z_Bytef

-# define charf z_charf

-# define intf z_intf

-# define uIntf z_uIntf

-# define uLongf z_uLongf

-# define voidpf z_voidpf

-# define voidp z_voidp

+# define Byte z_Byte

+# define uInt z_uInt

+# define uLong z_uLong

+# define Bytef z_Bytef

+# define charf z_charf

+# define intf z_intf

+# define uIntf z_uIntf

+# define uLongf z_uLongf

+# define voidpf z_voidpf

+# define voidp z_voidp

#endif

#if defined(__MSDOS__) && !defined(MSDOS)

diff --git a/sys/lib/libz/zlib.h b/sys/lib/libz/zlib.h
index 8d89aab7520..da15c96b447 100644
--- a/sys/lib/libz/zlib.h
+++ b/sys/lib/libz/zlib.h

@@ -1,8 +1,8 @@

-/* $OpenBSD: zlib.h,v 1.7 2003/12/16 23:57:48 millert Exp $ */

+/* $OpenBSD: zlib.h,v 1.8 2004/12/03 03:07:09 djm Exp $ */

/* zlib.h -- interface of the 'zlib' general purpose compression library

- version 1.2.1, November 17th, 2003

+ version 1.2.2, October 3rd, 2004

This software is provided 'as-is', without any express or implied

warranty. In no event will the authors be held liable for any damages

@@ -38,8 +38,8 @@

extern "C" {

#endif

-#define ZLIB_VERSION "1.2.1"

-#define ZLIB_VERNUM 0x1210

+#define ZLIB_VERSION "1.2.2"

+#define ZLIB_VERNUM 0x1220

The 'zlib' compression library provides in-memory compression and

@@ -54,24 +54,22 @@ extern "C" {

application must provide more input and/or consume the output

(providing more output space) before each call.

- The compressed data format used by the in-memory functions is the zlib

- format, which is a zlib wrapper documented in RFC 1950, wrapped around a

- deflate stream, which is itself documented in RFC 1951.

+ The compressed data format used by default by the in-memory functions is

+ the zlib format, which is a zlib wrapper documented in RFC 1950, wrapped

+ around a deflate stream, which is itself documented in RFC 1951.

The library also supports reading and writing files in gzip (.gz) format

with an interface similar to that of stdio using the functions that start

with "gz". The gzip format is different from the zlib format. gzip is a

gzip wrapper, documented in RFC 1952, wrapped around a deflate stream.

+ This library can optionally read and write gzip streams in memory as well.

The zlib format was designed to be compact and fast for use in memory

and on communications channels. The gzip format was designed for single-

file compression on file systems, has a larger header than zlib to maintain

directory information, and uses a different, slower check method than zlib.

- This library does not provide any functions to write gzip files in memory.

- However such functions could be easily written using zlib's deflate function,

- the documentation in the gzip RFC, and the examples in gzio.c.

The library does not install any signal handler. The decoder checks

the consistency of the compressed data, so the library should never

crash even in case of corrupted input.

@@ -402,7 +400,7 @@ ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));

because Z_BLOCK is used.

If a preset dictionary is needed after this call (see inflateSetDictionary

- below), inflate sets strm-adler to the adler32 checksum of the dictionary

+ below), inflate sets strm->adler to the adler32 checksum of the dictionary

chosen by the compressor and returns Z_NEED_DICT; otherwise it sets

strm->adler to the adler32 checksum of all output produced so far (that is,

total_out bytes) and returns Z_OK, Z_STREAM_END or an error code as described

@@ -479,7 +477,8 @@ ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,

16 to windowBits to write a simple gzip header and trailer around the

compressed data instead of a zlib wrapper. The gzip header will have no

file name, no extra data, no comment, no modification time (set to zero),

- no header crc, and the operating system will be set to 255 (unknown).

+ no header crc, and the operating system will be set to 255 (unknown). If a

+ gzip stream is being written, strm->adler is a crc32 instead of an adler32.

The memLevel parameter specifies how much memory should be allocated

for the internal compression state. memLevel=1 uses minimum memory but

@@ -650,7 +649,8 @@ ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,

windowBits can also be greater than 15 for optional gzip decoding. Add

32 to windowBits to enable zlib and gzip decoding with automatic header

detection, or add 16 to decode only the gzip format (the zlib format will

- return a Z_DATA_ERROR).

+ return a Z_DATA_ERROR. If a gzip stream is being decoded, strm->adler is

+ a crc32 instead of an adler32.

inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough

memory, Z_STREAM_ERROR if a parameter is invalid (such as a negative

@@ -1190,7 +1190,7 @@ ZEXTERN int ZEXPORT inflateBackInit_ OF((z_stream FAR *strm, int windowBits,

struct internal_state {int dummy;}; /* hack for buggy compilers */

#endif

-ZEXTERN const char * ZEXPORT zError OF((int err));

+ZEXTERN const char * ZEXPORT zError OF((int));

ZEXTERN int ZEXPORT inflateSyncPoint OF((z_streamp z));

ZEXTERN const uLongf * ZEXPORT get_crc_table OF((void));

diff --git a/sys/lib/libz/zutil.h b/sys/lib/libz/zutil.h
index c721fc43a65..24bac90d5e0 100644
--- a/sys/lib/libz/zutil.h
+++ b/sys/lib/libz/zutil.h

@@ -1,4 +1,4 @@

-/* $OpenBSD: zutil.h,v 1.14 2003/12/17 04:58:56 millert Exp $ */

+/* $OpenBSD: zutil.h,v 1.15 2004/12/03 03:07:09 djm Exp $ */

/* zutil.h -- internal interface and configuration of the compression library

* For conditions of distribution and use, see copyright notice in zlib.h

@@ -193,9 +193,14 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */

# define NO_vsnprintf

# endif

#endif

+#ifdef VMS

+# define NO_vsnprintf

+#endif

#ifdef HAVE_STRERROR

- extern char *strerror OF((int));

+# ifndef VMS

+ extern char *strerror OF((int));

+# endif

# define zstrerror(errnum) strerror(errnum)

#else

# define zstrerror(errnum) ""