summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-01-26 16:47:36 +0000
committerMatt Caswell <matt@openssl.org>2015-01-27 14:33:32 +0000
commit1895583835239bc44c3f6584e48f0279ad884f3b (patch)
tree62d70030824b2a9fd09dca061e41b8868d2ce8e7
parent5226c62b7632dfaf38480919d406307318a7d145 (diff)
downloadopenssl-new-1895583835239bc44c3f6584e48f0279ad884f3b.tar.gz
Make DTLS always act as if read_ahead is set. The actual value of read_ahead
is ignored for DTLS. RT#3657 Reviewed-by: Andy Polyakov <appro@openssl.org> (cherry picked from commit 8dd4ad0ff5d1d07ec4b6dd5d5104131269a472aa)
-rw-r--r--ssl/s3_pkt.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index 5644dd8f26..d422abfda0 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -217,7 +217,8 @@ int ssl3_read_n(SSL *s, int n, int max, int extend)
return -1;
}
- if (!s->read_ahead)
+ /* We always act like read_ahead is set for DTLS */
+ if (!s->read_ahead && !SSL_IS_DTLS(s))
/* ignore max parameter */
max = n;
else {