Commit a4c4a7d5 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

stop warning when compiling with no-comp

parent bdcf772a

ssl/s3_srvr.c

+4 −1
Original line number Diff line number Diff line
@@ -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;

ssl/ssltest.c

+3 −1
Original line number Diff line number Diff line
@@ -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;