From 1ae3fdbe6a7e78eef4d7678cb08ff468481c24ad Mon Sep 17 00:00:00 2001 From: Adam Langley Date: Fri, 12 Jun 2015 08:05:49 +0100 Subject: 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 Reviewed-by: Matt Caswell --- ssl/t1_lib.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'ssl') diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index f0565a2291..402047a237 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)) -- cgit v1.2.3