[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  1ae3fdbe6a7e78eef4d7678cb08ff468481c24ad (commit)
      from  4b464e7b46682f568a5df550426b0cf4b22e2485 (commit)


- Log -----------------------------------------------------------------
commit 1ae3fdbe6a7e78eef4d7678cb08ff468481c24ad
Author: Adam Langley <agl at google.com>
Date:   Fri Jun 12 08:05:49 2015 +0100

    Allow a zero length extension block
    
    It is valid for an extension block to be present in a ClientHello, but to
    be of zero length.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>

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

Summary of changes:
 ssl/t1_lib.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index f0565a2..402047a 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -1940,12 +1940,12 @@ static int ssl_scan_clienthello_tlsext(SSL *s, unsigned char **p,
 
     s->srtp_profile = NULL;
 
-    if (data >= (d + n - 2)) {
-        if (data != d + n)
-            goto err;
-        else
-            goto ri_check;
-    }
+    if (data == d + n)
+        goto ri_check;
+
+    if (data > (d + n - 2))
+        goto err;
+
     n2s(data, len);
 
     if (data > (d + n - len))