From: Michael Tuexen <tuexen@fh-muenster.de>
Date: Mon, 18 Mar 2013 14:30:38 +0000 (+0000)
Subject: Avoid unnecessary fragmentation.
X-Git-Tag: OpenSSL_1_0_0l~31
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a1a45c59ec3518e2cacea5e2c789a1bb770063e9;p=oweals%2Fopenssl.git

Avoid unnecessary fragmentation.
(cherry picked from commit 80ccc66d7eedb2d06050130c77c482ae1584199a)
---

diff --git a/ssl/d1_both.c b/ssl/d1_both.c
index 2f95880249..7cf4b7a733 100644
--- a/ssl/d1_both.c
+++ b/ssl/d1_both.c
@@ -313,9 +313,10 @@ int dtls1_do_write(SSL *s, int type)
 				s->init_off -= DTLS1_HM_HEADER_LENGTH;
 				s->init_num += DTLS1_HM_HEADER_LENGTH;
 
-				/* write atleast DTLS1_HM_HEADER_LENGTH bytes */
-				if ( len <= DTLS1_HM_HEADER_LENGTH)  
-					len += DTLS1_HM_HEADER_LENGTH;
+				if ( s->init_num > curr_mtu)
+					len = curr_mtu;
+				else
+					len = s->init_num;
 				}
 
 			dtls1_fix_message_header(s, frag_off,