From: Sergio Garcia Murillo <sergio.garcia.murillo@gmail.com>
Date: Thu, 5 May 2016 21:27:30 +0000 (-0400)
Subject: GH356: Change assert to normal error
X-Git-Tag: OpenSSL_1_1_0-pre6~919
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=50b4a9ba1382de7a1990fb4716585754b9c7f50d;p=thirdparty%2Fopenssl.git

GH356: Change assert to normal error

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/ssl/statem/statem_dtls.c b/ssl/statem/statem_dtls.c
index a3090ef4908..88969b1d5d7 100644
--- a/ssl/statem/statem_dtls.c
+++ b/ssl/statem/statem_dtls.c
@@ -224,8 +224,9 @@ int dtls1_do_write(SSL *s, int type)
     if (!dtls1_query_mtu(s))
         return -1;
 
-    OPENSSL_assert(s->d1->mtu >= dtls1_min_mtu(s)); /* should have something
-                                                     * reasonable now */
+    if (s->d1->mtu < dtls1_min_mtu(s))
+        /* should have something reasonable now */
+        return -1;
 
     if (s->init_off == 0 && type == SSL3_RT_HANDSHAKE)
         OPENSSL_assert(s->init_num ==