Commit f7d514f4 authored by Bodo Möller's avatar Bodo Möller
Browse files

In ssl3_clear, preserve s3->init_extra along with s3->rbuf. 

Submitted by: Bob Buckholz <bbuckholz@google.com>
parent 6d50bce7

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ 


 Changes between 0.9.8r and 0.9.8s [xx XXX xxxx]



  *) In ssl3_clear, preserve s3->init_extra along with s3->rbuf.

     [Bob Buckholz (Google)]



  *) Fix SSL memory handling for (EC)DH ciphersuites, in particular

     for multi-threaded use of ECDH.

     [Adam Langley (Google)]

ssl/s3_lib.c

+3 −1
Original line number Diff line number Diff line
@@ -1710,6 +1710,7 @@ void ssl3_clear(SSL *s) 
	{

	unsigned char *rp,*wp;

	size_t rlen, wlen;

	int init_extra;



	ssl3_cleanup_key_block(s);

	if (s->s3->tmp.ca_names != NULL)
@@ -1739,6 +1740,7 @@ void ssl3_clear(SSL *s) 
	wp = s->s3->wbuf.buf;

	rlen = s->s3->rbuf.len;

 	wlen = s->s3->wbuf.len;

        init_extra = s->s3->init_extra;



	EVP_MD_CTX_cleanup(&s->s3->finish_dgst1);

	EVP_MD_CTX_cleanup(&s->s3->finish_dgst2);
@@ -1748,6 +1750,7 @@ void ssl3_clear(SSL *s) 
	s->s3->wbuf.buf = wp;

	s->s3->rbuf.len = rlen;

 	s->s3->wbuf.len = wlen;

	s->s3->init_extra = init_extra;



	ssl_free_wbio_buffer(s);
@@ -2641,4 +2644,3 @@ need to go to SSL_ST_ACCEPT. 
		}

	return(ret);

	}