diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2011-11-03 02:34:34 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2011-11-03 02:34:34 +0000 |
| commit | 83e0d2b6dc9f5d1e1d9da1d5fb2b3e4a1b95ed29 (patch) | |
| tree | b4be7ab0261dff4bf6e721d276b191619415c6e4 /lib/libssl/s3_pkt.c | |
| parent | ce9ed2f66babb3442b71c8a7b580758c546d433a (diff) | |
openssl-1.0.0e: resolve conflicts
Diffstat (limited to 'lib/libssl/s3_pkt.c')
| -rw-r--r-- | lib/libssl/s3_pkt.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/libssl/s3_pkt.c b/lib/libssl/s3_pkt.c index e3f6050a26a..f9b3629cf78 100644 --- a/lib/libssl/s3_pkt.c +++ b/lib/libssl/s3_pkt.c @@ -246,7 +246,8 @@ int ssl3_read_n(SSL *s, int n, int max, int extend) if (i <= 0) { rb->left = left; - if (s->mode & SSL_MODE_RELEASE_BUFFERS) + if (s->mode & SSL_MODE_RELEASE_BUFFERS && + SSL_version(s) != DTLS1_VERSION && SSL_version(s) != DTLS1_BAD_VER) if (len+left == 0) ssl3_release_read_buffer(s); return(i); @@ -846,7 +847,8 @@ int ssl3_write_pending(SSL *s, int type, const unsigned char *buf, { wb->left=0; wb->offset+=i; - if (s->mode & SSL_MODE_RELEASE_BUFFERS) + if (s->mode & SSL_MODE_RELEASE_BUFFERS && + SSL_version(s) != DTLS1_VERSION && SSL_version(s) != DTLS1_BAD_VER) ssl3_release_write_buffer(s); s->rwstate=SSL_NOTHING; return(s->s3->wpend_ret); |