diff options
author | deraadt <> | 2014-04-12 17:00:23 +0000 |
---|---|---|
committer | deraadt <> | 2014-04-12 17:00:23 +0000 |
commit | c8faae74f61f5fc2f42186c67b2862802758b04b (patch) | |
tree | bfdab34f2747e621314c411c399599c7018eb37a | |
parent | 0c9b71e493dec9864976f17b42bf36b7dba29b8e (diff) | |
download | openbsd-OPENBSD_5_3.tar.gz openbsd-OPENBSD_5_3.tar.bz2 openbsd-OPENBSD_5_3.zip |
from head, will become 5.3 015_openssl.patchOPENBSD_5_3
Changes by: tedu@cvs.openbsd.org 2014/04/10 13:01:37
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
-rw-r--r-- | src/lib/libssl/src/ssl/s3_pkt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/libssl/src/ssl/s3_pkt.c b/src/lib/libssl/src/ssl/s3_pkt.c index a7d2defbea..898f4a1107 100644 --- a/src/lib/libssl/src/ssl/s3_pkt.c +++ b/src/lib/libssl/src/ssl/s3_pkt.c | |||
@@ -1054,7 +1054,7 @@ start: | |||
1054 | { | 1054 | { |
1055 | s->rstate=SSL_ST_READ_HEADER; | 1055 | s->rstate=SSL_ST_READ_HEADER; |
1056 | rr->off=0; | 1056 | rr->off=0; |
1057 | if (s->mode & SSL_MODE_RELEASE_BUFFERS) | 1057 | if (s->mode & SSL_MODE_RELEASE_BUFFERS && s->s3->rbuf.left == 0) |
1058 | ssl3_release_read_buffer(s); | 1058 | ssl3_release_read_buffer(s); |
1059 | } | 1059 | } |
1060 | } | 1060 | } |