diff options
| author | Bodo Möller <bodo@openssl.org> | 2011-10-13 13:05:35 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2011-10-13 13:05:35 +0000 |
| commit | f72c1a58cb122bea63b53ba3e35f41d0419c36f9 (patch) | |
| tree | 952379352f32bb14260cf01e1e0d4912efcfb585 | |
| parent | 2461396f69e931c42895b92ab68f840356bcfe4d (diff) | |
In ssl3_clear, preserve s3->init_extra along with s3->rbuf.
Submitted by: Bob Buckholz <bbuckholz@google.com>
| -rw-r--r-- | CHANGES | 12 | ||||
| -rw-r--r-- | ssl/s3_lib.c | 3 |
2 files changed, 13 insertions, 2 deletions
@@ -2,7 +2,7 @@ OpenSSL CHANGES _______________ - Changes between 1.0.0e and 1.0.1 [xx XXX xxxx] + Changes between 1.0.0f and 1.0.1 [xx XXX xxxx] *) Use type ossl_ssize_t instad of ssize_t which isn't available on all platforms. Move ssize_t definition from e_os.h to the public @@ -224,7 +224,12 @@ Add command line options to s_client/s_server. [Steve Henson] - Changes between 1.0.0d and 1.0.0e [xx XXX xxxx] + Changes between 1.0.0e and 1.0.0f [xx XXX xxxx] + + *) In ssl3_clear, preserve s3->init_extra along with s3->rbuf. + [Bob Buckholz (Google)] + + Changes between 1.0.0d and 1.0.0e [6 Sep 2011] *) Fix bug where CRLs with nextUpdate in the past are sometimes accepted by initialising X509_STORE_CTX properly. (CVE-2011-3207) @@ -1131,6 +1136,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)] diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index c82dcc744c..14608a888a 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -3000,6 +3000,7 @@ void ssl3_clear(SSL *s) { unsigned char *rp,*wp; size_t rlen, wlen; + int init_extra; #ifdef TLSEXT_TYPE_opaque_prf_input if (s->s3->client_opaque_prf_input != NULL) @@ -3038,6 +3039,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; if (s->s3->handshake_buffer) { BIO_free(s->s3->handshake_buffer); s->s3->handshake_buffer = NULL; @@ -3050,6 +3052,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); |