35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
diff -up openssl-1.0.1e/ssl/d1_pkt.c.dtls1-reads openssl-1.0.1e/ssl/d1_pkt.c
|
|
--- openssl-1.0.1e/ssl/d1_pkt.c.dtls1-reads 2015-01-12 17:31:41.647213706 +0100
|
|
+++ openssl-1.0.1e/ssl/d1_pkt.c 2015-01-12 17:38:21.708261411 +0100
|
|
@@ -641,8 +641,6 @@ again:
|
|
/* now s->packet_length == DTLS1_RT_HEADER_LENGTH */
|
|
i=rr->length;
|
|
n=ssl3_read_n(s,i,i,1);
|
|
- if (n <= 0) return(n); /* error or non-blocking io */
|
|
-
|
|
/* this packet contained a partial record, dump it */
|
|
if ( n != i)
|
|
{
|
|
@@ -677,7 +675,8 @@ again:
|
|
* would be dropped unnecessarily.
|
|
*/
|
|
if (!(s->d1->listen && rr->type == SSL3_RT_HANDSHAKE &&
|
|
- *p == SSL3_MT_CLIENT_HELLO) &&
|
|
+ s->packet_length > DTLS1_RT_HEADER_LENGTH &&
|
|
+ s->packet[DTLS1_RT_HEADER_LENGTH] == SSL3_MT_CLIENT_HELLO) &&
|
|
!dtls1_record_replay_check(s, bitmap))
|
|
{
|
|
rr->length = 0;
|
|
diff -up openssl-1.0.1e/ssl/s3_pkt.c.dtls1-reads openssl-1.0.1e/ssl/s3_pkt.c
|
|
--- openssl-1.0.1e/ssl/s3_pkt.c.dtls1-reads 2015-01-12 17:31:41.680214453 +0100
|
|
+++ openssl-1.0.1e/ssl/s3_pkt.c 2015-01-12 17:38:06.721922482 +0100
|
|
@@ -182,6 +182,8 @@ int ssl3_read_n(SSL *s, int n, int max,
|
|
* at once (as long as it fits into the buffer). */
|
|
if (SSL_version(s) == DTLS1_VERSION || SSL_version(s) == DTLS1_BAD_VER)
|
|
{
|
|
+ if (left == 0 && extend)
|
|
+ return 0;
|
|
if (left > 0 && n > left)
|
|
n = left;
|
|
}
|