From: Dr. Stephen Henson <steve@openssl.org>
Date: Sat, 29 Dec 2012 23:37:56 +0000 (+0000)
Subject: stop warning when compiling with no-comp
X-Git-Tag: master-post-reformat~1493
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a4c4a7d5cafaf7e0933d024d189f72b2e350b628;p=oweals%2Fopenssl.git

stop warning when compiling with no-comp
---

diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index 75abebb22f..389f708b3e 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -940,9 +940,10 @@ int ssl3_get_client_hello(SSL *s)
 	unsigned int cookie_len;
 	long n;
 	unsigned long id;
-	unsigned char *p,*d,*q;
+	unsigned char *p,*d;
 	SSL_CIPHER *c;
 #ifndef OPENSSL_NO_COMP
+	unsigned char *q;
 	SSL_COMP *comp=NULL;
 #endif
 	STACK_OF(SSL_CIPHER) *ciphers=NULL;
@@ -1178,7 +1179,9 @@ int ssl3_get_client_hello(SSL *s)
 		SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_LENGTH_MISMATCH);
 		goto f_err;
 		}
+#ifndef OPENSSL_NO_COMP
 	q=p;
+#endif
 	for (j=0; j<i; j++)
 		{
 		if (p[j] == 0) break;
diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index faffbca42c..542ae0eef1 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -620,8 +620,8 @@ int main(int argc, char *argv[])
 	int no_psk = 0;
 	int print_time = 0;
 	clock_t s_time = 0, c_time = 0;
-	int comp = 0;
 #ifndef OPENSSL_NO_COMP
+	int comp = 0;
 	COMP_METHOD *cm = NULL;
 	STACK_OF(SSL_COMP) *ssl_comp_methods = NULL;
 #endif
@@ -815,6 +815,7 @@ int main(int argc, char *argv[])
 			{
 			print_time = 1;
 			}
+#ifndef OPENSSL_NO_COMP
 		else if	(strcmp(*argv,"-zlib") == 0)
 			{
 			comp = COMP_ZLIB;
@@ -823,6 +824,7 @@ int main(int argc, char *argv[])
 			{
 			comp = COMP_RLE;
 			}
+#endif
 		else if	(strcmp(*argv,"-named_curve") == 0)
 			{
 			if (--argc < 1) goto bad;