generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

stop warning when compiling with no-comp

Browse Source
This commit is contained in:
Dr. Stephen Henson 2012-12-30 01:12:19 +00:00
parent 8c3f868983
commit 2e00f46b51
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ssl/s3_srvr.c
View File

@ -941,9 +941,10 @@ int ssl3_get_client_hello(SSL *s)
unsigned int cookie_len; unsigned int cookie_len;
long n; long n;
unsigned long id; unsigned long id;
unsigned char *p,*d,*q; unsigned char *p,*d;
SSL_CIPHER *c; SSL_CIPHER *c;
#ifndef OPENSSL_NO_COMP #ifndef OPENSSL_NO_COMP
unsigned char *q;
SSL_COMP *comp=NULL; SSL_COMP *comp=NULL;
#endif #endif
STACK_OF(SSL_CIPHER) *ciphers=NULL; 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); SSLerr(SSL_F_SSL3_GET_CLIENT_HELLO,SSL_R_LENGTH_MISMATCH);
goto f_err; goto f_err;
} }
#ifndef OPENSSL_NO_COMP
q=p; q=p;
#endif
for (j=0; j<i; j++) for (j=0; j<i; j++)
{ {
if (p[j] == 0) break; if (p[j] == 0) break;

4
ssl/ssltest.c
View File

@ -595,8 +595,8 @@ int main(int argc, char *argv[])
int no_psk = 0; int no_psk = 0;
int print_time = 0; int print_time = 0;
clock_t s_time = 0, c_time = 0; clock_t s_time = 0, c_time = 0;
int comp = 0;
#ifndef OPENSSL_NO_COMP #ifndef OPENSSL_NO_COMP
int comp = 0;
COMP_METHOD *cm = NULL; COMP_METHOD *cm = NULL;
STACK_OF(SSL_COMP) *ssl_comp_methods = NULL; STACK_OF(SSL_COMP) *ssl_comp_methods = NULL;
#endif #endif
@ -795,6 +795,7 @@ int main(int argc, char *argv[])
{ {
print_time = 1; print_time = 1;
} }
#ifndef OPENSSL_NO_COMP
else if (strcmp(*argv,"-zlib") == 0) else if (strcmp(*argv,"-zlib") == 0)
{ {
comp = COMP_ZLIB; comp = COMP_ZLIB;
@ -803,6 +804,7 @@ int main(int argc, char *argv[])
{ {
comp = COMP_RLE; comp = COMP_RLE;
} }
#endif
else if (strcmp(*argv,"-named_curve") == 0) else if (strcmp(*argv,"-named_curve") == 0)
{ {
if (--argc < 1) goto bad; if (--argc < 1) goto bad;