diff options
| author | tedu <> | 2014-04-10 19:01:37 +0000 |
|---|---|---|
| committer | tedu <> | 2014-04-10 19:01:37 +0000 |
| commit | 23fd0509acc109a566217e625948bd87ccdbb674 (patch) | |
| tree | d9b20fd9ac06013080d2917590c43f96fc7319e8 /src/lib | |
| parent | d5c5db838b04f3dbf46695b327ddaf2e0d4378d4 (diff) | |
| download | openbsd-23fd0509acc109a566217e625948bd87ccdbb674.tar.gz openbsd-23fd0509acc109a566217e625948bd87ccdbb674.tar.bz2 openbsd-23fd0509acc109a566217e625948bd87ccdbb674.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 'src/lib')
| -rw-r--r-- | src/lib/libssl/s3_pkt.c | 2 | ||||
| -rw-r--r-- | src/lib/libssl/src/ssl/s3_pkt.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/libssl/s3_pkt.c b/src/lib/libssl/s3_pkt.c index c5706eadb0..722ed9a858 100644 --- a/src/lib/libssl/s3_pkt.c +++ b/src/lib/libssl/s3_pkt.c | |||
| @@ -1054,6 +1054,8 @@ 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 && s->s3->rbuf.left == 0) | ||
| 1058 | ssl3_release_read_buffer(s); | ||
| 1057 | } | 1059 | } |
| 1058 | } | 1060 | } |
| 1059 | return(n); | 1061 | return(n); |
diff --git a/src/lib/libssl/src/ssl/s3_pkt.c b/src/lib/libssl/src/ssl/s3_pkt.c index c5706eadb0..722ed9a858 100644 --- a/src/lib/libssl/src/ssl/s3_pkt.c +++ b/src/lib/libssl/src/ssl/s3_pkt.c | |||
| @@ -1054,6 +1054,8 @@ 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 && s->s3->rbuf.left == 0) | ||
| 1058 | ssl3_release_read_buffer(s); | ||
| 1057 | } | 1059 | } |
| 1058 | } | 1060 | } |
| 1059 | return(n); | 1061 | return(n); |