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-29 23:37:56 +00:00
parent bdcf772aa5
commit a4c4a7d5ca
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

@ -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;

4
ssl/ssltest.c
View File

@ -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;