[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openssl-cvs
Subject:    [CVS] OpenSSL: OpenSSL_1_0_2-stable: openssl/ssl/ s3_srvr.c ssltest.c
From:       "Dr. Stephen Henson" <steve () openssl ! org>
Date:       2012-12-30 1:12:19
Message-ID: 20121230011219.9A0BD168A2 () master ! openssl ! org
[Download RAW message or body]

  OpenSSL CVS Repository
  http://cvs.openssl.org/
  ____________________________________________________________________________

  Server: cvs.openssl.org                  Name:   Dr. Stephen Henson
  Root:   /v/openssl/cvs                   Email:  steve@openssl.org
  Module: openssl                          Date:   30-Dec-2012 02:12:19
  Branch: OpenSSL_1_0_2-stable             Handle: 2012123001121900

  Modified files:           (Branch: OpenSSL_1_0_2-stable)
    openssl/ssl             s3_srvr.c ssltest.c

  Log:
    stop warning when compiling with no-comp

  Summary:
    Revision    Changes     Path
    1.171.2.21.2.24.2.20+4  -1      openssl/ssl/s3_srvr.c
    1.113.2.3.2.5.2.3+3  -1      openssl/ssl/ssltest.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openssl/ssl/s3_srvr.c
  ============================================================================
  $ cvs diff -u -r1.171.2.21.2.24.2.19 -r1.171.2.21.2.24.2.20 s3_srvr.c
  --- openssl/ssl/s3_srvr.c	26 Dec 2012 16:17:40 -0000	1.171.2.21.2.24.2.19
  +++ openssl/ssl/s3_srvr.c	30 Dec 2012 01:12:19 -0000	1.171.2.21.2.24.2.20
  @@ -941,9 +941,10 @@
   	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 @@
   		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;
  @@ .
  patch -p0 <<'@@ .'
  Index: openssl/ssl/ssltest.c
  ============================================================================
  $ cvs diff -u -r1.113.2.3.2.5.2.2 -r1.113.2.3.2.5.2.3 ssltest.c
  --- openssl/ssl/ssltest.c	7 Jun 2012 13:20:20 -0000	1.113.2.3.2.5.2.2
  +++ openssl/ssl/ssltest.c	30 Dec 2012 01:12:19 -0000	1.113.2.3.2.5.2.3
  @@ -595,8 +595,8 @@
   	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 @@
   			{
   			print_time = 1;
   			}
  +#ifndef OPENSSL_NO_COMP
   		else if	(strcmp(*argv,"-zlib") == 0)
   			{
   			comp = COMP_ZLIB;
  @@ -803,6 +804,7 @@
   			{
   			comp = COMP_RLE;
   			}
  +#endif
   		else if	(strcmp(*argv,"-named_curve") == 0)
   			{
   			if (--argc < 1) goto bad;
  @@ .
______________________________________________________________________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                     openssl-cvs@openssl.org
Automated List Manager                           majordomo@openssl.org
[prev in list] [next in list] [prev in thread] [next in thread]