[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

[Matt Caswell]

The branch OpenSSL_1_0_1-stable has been updated
       via  6cbc78906b24cd274f61d205d7f43d66ca08e808 (commit)
      from  fffcf87a550f76f83e4a17dd190c9c74833046e8 (commit)


- Log -----------------------------------------------------------------
commit 6cbc78906b24cd274f61d205d7f43d66ca08e808
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 c2d7d72..d70b93f 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -1016,12 +1016,12 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d,
 
     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))