The CVS commit below breaks static linking with zlib. zlib_loaded is not
defined if ZLIB_SHARED isn't.
$ cvs diff -u -r1.16 -r1.17 c_zlib.c
--- openssl/crypto/comp/c_zlib.c 18 Jun 2005 04:32:12 -0000 1.16
+++ openssl/crypto/comp/c_zlib.c 2 Dec 2005 13:27:19 -0000 1.17
@@ -397,13 +397,18 @@
p_deflateInit_
= (deflateInit__ft) DSO_bind_func(zlib_dso,
"deflateInit_");
- zlib_loaded++;
+
+ if (p_compress && p_inflateEnd && p_inflate
+ && p_inflateInit_ && p_deflateEnd
+ && p_deflate && p_deflateInit_)
+ zlib_loaded++;
}
}
#endif
#if defined(ZLIB) || defined(ZLIB_SHARED)
- meth = &zlib_stateful_method;
+ if (zlib_loaded)
+ meth = &zlib_stateful_method;
#endif
______________________________________________________________________
OpenSSL Project http://www.openssl.org
Development Mailing List openssl-dev@openssl.org
Automated List Manager [EMAIL PROTECTED]
