[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  50b4a9ba1382de7a1990fb4716585754b9c7f50d (commit)
      from  fc7f190c732729c1d0eb9dcdb7ff05ed6b06056f (commit)


- Log -----------------------------------------------------------------
commit 50b4a9ba1382de7a1990fb4716585754b9c7f50d
Author: Sergio Garcia Murillo <sergio.garcia.murillo at gmail.com>
Date:   Thu May 5 17:27:30 2016 -0400

    GH356: Change assert to normal error
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 ssl/statem/statem_dtls.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ssl/statem/statem_dtls.c b/ssl/statem/statem_dtls.c
index a3090ef..88969b1 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 ==