summaryrefslogtreecommitdiffstats
path: root/lib/libssl
diff options
context:
space:
mode:
authortedu <tedu@openbsd.org>2014-04-10 19:01:37 +0000
committertedu <tedu@openbsd.org>2014-04-10 19:01:37 +0000
commit56baae918c52bd62095d797e60e725ed49376a5c (patch)
treeaf8a7f92541cebbdeece4b0d7f91fd32a902d154 /lib/libssl
parentsync (diff)
downloadwireguard-openbsd-56baae918c52bd62095d797e60e725ed49376a5c.tar.xz
wireguard-openbsd-56baae918c52bd62095d797e60e725ed49376a5c.zip
Piotr Sikora pointed me at a more refined diff for the buffer release
issue. Apply that version. Maybe someday upstream will wake up and then we can have the same code. https://rt.openssl.org/Ticket/Display.html?id=2167&user=guest&pass=guest
Diffstat (limited to 'lib/libssl')
-rw-r--r--lib/libssl/s3_pkt.c2
-rw-r--r--lib/libssl/src/ssl/s3_pkt.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/libssl/s3_pkt.c b/lib/libssl/s3_pkt.c
index c5706eadb0d..722ed9a858f 100644
--- a/lib/libssl/s3_pkt.c
+++ b/lib/libssl/s3_pkt.c
@@ -1054,6 +1054,8 @@ start:
{
s->rstate=SSL_ST_READ_HEADER;
rr->off=0;
+ if (s->mode & SSL_MODE_RELEASE_BUFFERS && s->s3->rbuf.left == 0)
+ ssl3_release_read_buffer(s);
}
}
return(n);
diff --git a/lib/libssl/src/ssl/s3_pkt.c b/lib/libssl/src/ssl/s3_pkt.c
index c5706eadb0d..722ed9a858f 100644
--- a/lib/libssl/src/ssl/s3_pkt.c
+++ b/lib/libssl/src/ssl/s3_pkt.c
@@ -1054,6 +1054,8 @@ start:
{
s->rstate=SSL_ST_READ_HEADER;
rr->off=0;
+ if (s->mode & SSL_MODE_RELEASE_BUFFERS && s->s3->rbuf.left == 0)
+ ssl3_release_read_buffer(s);
}
}
return(n);