From dacd94b9c86d4f5c60ac90a8bb5da4469dd603a5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bodo=20M=C3=B6ller?= Date: Wed, 19 Oct 2011 13:53:41 +0000 Subject: [PATCH] Oops: this change (http://cvs.openssl.org/chngview?cn=21503) wasn't right for 0.9.8-stable (it's actually a fix for http://cvs.openssl.org/chngview?cn=14494, which introduced SSL_CTRL_SET_MAX_SEND_FRAGMENT). --- CHANGES | 3 --- ssl/s3_lib.c | 3 --- 2 files changed, 6 deletions(-) diff --git a/CHANGES b/CHANGES index f0d43922b9..a5da898ddb 100644 --- a/CHANGES +++ b/CHANGES @@ -4,9 +4,6 @@ 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)] diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 7e063969d2..a40621822b 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -1710,7 +1710,6 @@ 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) @@ -1740,7 +1739,6 @@ 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); @@ -1750,7 +1748,6 @@ 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); -- 2.25.1