From: Bodo Möller <bodo@openssl.org>
Date: Thu, 30 Nov 2000 23:41:58 +0000 (+0000)
Subject: COMP_zlib should always be declared, even if it is not functional.
X-Git-Tag: OpenSSL_0_9_6a-beta1~107^2~80
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=8df788c97fcca6e0c6b80555ef7b131b900c1465

COMP_zlib should always be declared, even if it is not functional.

Don't dump core in ssltest.
---

diff --git a/crypto/comp/comp.h b/crypto/comp/comp.h
index 0922609542..aee8fcdef9 100644
--- a/crypto/comp/comp.h
+++ b/crypto/comp/comp.h
@@ -39,9 +39,7 @@ int COMP_compress_block(COMP_CTX *ctx, unsigned char *out, int olen,
 int COMP_expand_block(COMP_CTX *ctx, unsigned char *out, int olen,
 	unsigned char *in, int ilen);
 COMP_METHOD *COMP_rle(void );
-#ifdef ZLIB
 COMP_METHOD *COMP_zlib(void );
-#endif
 
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 1e685346dd..77ac362c81 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -229,7 +229,7 @@ int main(int argc, char *argv[])
 	int print_time = 0;
 	clock_t s_time = 0, c_time = 0;
 	int comp = 0;
-	COMP_METHOD *cm;
+	COMP_METHOD *cm = NULL;
 
 	verbose = 0;
 	debug = 0;