From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 30 Dec 2012 01:12:19 +0000 (+0000)
Subject: stop warning when compiling with no-comp
X-Git-Tag: OpenSSL_1_0_2-beta1~474
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2e00f46b515ecf3c6378d7e7362e7c0044a204cc;p=oweals%2Fopenssl.git

stop warning when compiling with no-comp
---

diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c
index ed7d34f724..d8bce55f42 100644
--- a/ssl/s3_srvr.c
+++ b/ssl/s3_srvr.c
@@ -941,9 +941,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;
@@ -1179,7 +1180,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 1f557dd9a1..3c010409ab 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -595,8 +595,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
@@ -795,6 +795,7 @@ int main(int argc, char *argv[])
 			{
 			print_time = 1;
 			}
+#ifndef OPENSSL_NO_COMP
 		else if	(strcmp(*argv,"-zlib") == 0)
 			{
 			comp = COMP_ZLIB;
@@ -803,6 +804,7 @@ int main(int argc, char *argv[])
 			{
 			comp = COMP_RLE;
 			}
+#endif
 		else if	(strcmp(*argv,"-named_curve") == 0)
 			{
 			if (--argc < 1) goto bad;