diff options
| author |   tedu <tedu@openbsd.org> | 2014-04-19 19:40:11 +0000 |
|---|---|---|
| committer | tedu <tedu@openbsd.org> | 2014-04-19 19:40:11 +0000 |
| commit | 35d6a12ded50b03b4adec8753ae03dbcbd9d22bf (patch) | |
| tree | 71b568b5fabb14944639cd53e9fbd15f65a90d31 | |
| parent | remove hosts.equiv xr (diff) | |
| download | wireguard-openbsd-35d6a12ded50b03b4adec8753ae03dbcbd9d22bf.tar.xz wireguard-openbsd-35d6a12ded50b03b4adec8753ae03dbcbd9d22bf.zip | |
release buffers fix was lost in merge. put it back.
| -rw-r--r-- | lib/libssl/s3_pkt.c | 3 | ||||
| -rw-r--r-- | lib/libssl/src/ssl/s3_pkt.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/libssl/s3_pkt.c b/lib/libssl/s3_pkt.c index 52c48e945e1..60c51146acb 100644 --- a/lib/libssl/s3_pkt.c +++ b/lib/libssl/s3_pkt.c @@ -986,7 +986,8 @@ start: if (rr->length == 0) { s->rstate = SSL_ST_READ_HEADER; rr->off = 0; - if (s->mode & SSL_MODE_RELEASE_BUFFERS) + if (s->mode & SSL_MODE_RELEASE_BUFFERS && + s->s3->rbuf.left == 0) ssl3_release_read_buffer(s); } } diff --git a/lib/libssl/src/ssl/s3_pkt.c b/lib/libssl/src/ssl/s3_pkt.c index 52c48e945e1..60c51146acb 100644 --- a/lib/libssl/src/ssl/s3_pkt.c +++ b/lib/libssl/src/ssl/s3_pkt.c @@ -986,7 +986,8 @@ start: if (rr->length == 0) { s->rstate = SSL_ST_READ_HEADER; rr->off = 0; - if (s->mode & SSL_MODE_RELEASE_BUFFERS) + if (s->mode & SSL_MODE_RELEASE_BUFFERS && + s->s3->rbuf.left == 0) ssl3_release_read_buffer(s); } } |