OpenSSL: OpenSSL_0_9_8-stable: openssl/ssl/ s3_lib.c t1_lib.c

  OpenSSL CVS Repository
  http://cvs.openssl.org/
 
____________________________________________________________
________________

  Server: cvs.openssl.org                  Name:   Bodo
Moeller
  Root:   /v/openssl/cvs                   Email:  bodoopenssl.org
  Module: openssl                          Date:  
21-Sep-2007 16:05:09
  Branch: OpenSSL_0_9_8-stable             Handle:
2007092115050602

  Modified files:           (Branch: OpenSSL_0_9_8-stable)
    openssl/ssl             s3_lib.c t1_lib.c

  Log:
    More changes from HEAD:
    
    - no need to disable SSL 2.0 for
SSL_CTRL_SET_TLSEXT_HOSTNAME
      now that ssl23_client_hello takes care of that
    
    - fix buffer overrun checks in
ssl_add_serverhello_tlsext()

  Summary:
    Revision    Changes     Path
    1.74.2.20   +0  -1      openssl/ssl/s3_lib.c
    1.13.2.6    +2  -2      openssl/ssl/t1_lib.c
 
____________________________________________________________
________________

  patch -p0 <<' .'
  Index: openssl/ssl/s3_lib.c
 
============================================================
================
  $ cvs diff -u -r1.74.2.19 -r1.74.2.20 s3_lib.c
  --- openssl/ssl/s3_lib.c	21 Sep 2007 13:40:50
-0000	1.74.2.19
  +++ openssl/ssl/s3_lib.c	21 Sep 2007 14:05:06
-0000	1.74.2.20
   -1931,7 +1931,6 
   			SSLerr(SSL_F_SSL3_CTRL,
SSL_R_SSL3_EXT_INVALID_SERVERNAME_TYPE);
   			return 0;
   			}
  -		s->options |= SSL_OP_NO_SSLv2; /* can't use
extension w/ SSL 2.0 format */
    		break;
   	case SSL_CTRL_SET_TLSEXT_DEBUG_ARG:
   		s->tlsext_debug_arg=parg;
   .
  patch -p0 <<' .'
  Index: openssl/ssl/t1_lib.c
 
============================================================
================
  $ cvs diff -u -r1.13.2.5 -r1.13.2.6 t1_lib.c
  --- openssl/ssl/t1_lib.c	21 Sep 2007 13:40:51
-0000	1.13.2.5
  +++ openssl/ssl/t1_lib.c	21 Sep 2007 14:05:08
-0000	1.13.2.6
   -207,7 +207,7 
   
   	if (!s->hit && s->servername_done == 1
&& s->session->tlsext_hostname != NULL)
   		{ 
  -		if (limit - p - 4 < 0) return NULL; 
  +		if (limit - ret - 4 < 0) return NULL; 
   
   		s2n(TLSEXT_TYPE_server_name,ret);
   		s2n(0,ret);
   -216,7 +216,7 
   	if (s->tlsext_ticket_expected
   		&& !(SSL_get_options(s) &
SSL_OP_NO_TICKET)) 
   		{ 
  -		if (limit - p - 4 < 0) return NULL; 
  +		if (limit - ret - 4 < 0) return NULL; 
   		s2n(TLSEXT_TYPE_session_ticket,ret);
   		s2n(0,ret);
   		}
   .
____________________________________________________________
__________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                    
openssl-cvsopenssl.org
Automated List Manager                          
majordomoopenssl.org