summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortedu <>2014-04-19 19:40:11 +0000
committertedu <>2014-04-19 19:40:11 +0000
commit7f668454d49fa20a1888474bc9fd7a91ca665e34 (patch)
treea331fdbc85c26178cbfeb3f05f6a2ceee6b97675
parent02726a620024dad6521822efaf7dd58304adfac6 (diff)
downloadopenbsd-7f668454d49fa20a1888474bc9fd7a91ca665e34.tar.gz
openbsd-7f668454d49fa20a1888474bc9fd7a91ca665e34.tar.bz2
openbsd-7f668454d49fa20a1888474bc9fd7a91ca665e34.zip
release buffers fix was lost in merge. put it back.
-rw-r--r--src/lib/libssl/s3_pkt.c3
-rw-r--r--src/lib/libssl/src/ssl/s3_pkt.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/libssl/s3_pkt.c b/src/lib/libssl/s3_pkt.c
index 52c48e945e..60c51146ac 100644
--- a/src/lib/libssl/s3_pkt.c
+++ b/src/lib/libssl/s3_pkt.c
@@ -986,7 +986,8 @@ start:
986 if (rr->length == 0) { 986 if (rr->length == 0) {
987 s->rstate = SSL_ST_READ_HEADER; 987 s->rstate = SSL_ST_READ_HEADER;
988 rr->off = 0; 988 rr->off = 0;
989 if (s->mode & SSL_MODE_RELEASE_BUFFERS) 989 if (s->mode & SSL_MODE_RELEASE_BUFFERS &&
990 s->s3->rbuf.left == 0)
990 ssl3_release_read_buffer(s); 991 ssl3_release_read_buffer(s);
991 } 992 }
992 } 993 }
diff --git a/src/lib/libssl/src/ssl/s3_pkt.c b/src/lib/libssl/src/ssl/s3_pkt.c
index 52c48e945e..60c51146ac 100644
--- a/src/lib/libssl/src/ssl/s3_pkt.c
+++ b/src/lib/libssl/src/ssl/s3_pkt.c
@@ -986,7 +986,8 @@ start:
986 if (rr->length == 0) { 986 if (rr->length == 0) {
987 s->rstate = SSL_ST_READ_HEADER; 987 s->rstate = SSL_ST_READ_HEADER;
988 rr->off = 0; 988 rr->off = 0;
989 if (s->mode & SSL_MODE_RELEASE_BUFFERS) 989 if (s->mode & SSL_MODE_RELEASE_BUFFERS &&
990 s->s3->rbuf.left == 0)
990 ssl3_release_read_buffer(s); 991 ssl3_release_read_buffer(s);
991 } 992 }
992 } 993 }