You need to sign in or sign up before continuing.
提交 a4c4a7d5 编写于 作者: D Dr. Stephen Henson

stop warning when compiling with no-comp

上级 bdcf772a
...@@ -940,9 +940,10 @@ int ssl3_get_client_hello(SSL *s) ...@@ -940,9 +940,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;
...@@ -1178,7 +1179,9 @@ int ssl3_get_client_hello(SSL *s) ...@@ -1178,7 +1179,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;
......
...@@ -620,8 +620,8 @@ int main(int argc, char *argv[]) ...@@ -620,8 +620,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
...@@ -815,6 +815,7 @@ int main(int argc, char *argv[]) ...@@ -815,6 +815,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;
...@@ -823,6 +824,7 @@ int main(int argc, char *argv[]) ...@@ -823,6 +824,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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册