From 11074f6b1e6b24bcac4e18463aedabbe359b370b Mon Sep 17 00:00:00 2001
From: jkim <jkim@FreeBSD.org>
Date: Fri, 12 Jun 2015 17:10:19 +0000
Subject: MFC:	r284329

Merge OpenSSL 1.0.1o.

Note it is instantly merged because it restores ABI compatibility broken by
the previous OpenSSL 1.0.1n.

Relnotes:	yes
---
 crypto/openssl/ssl/t1_lib.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'crypto/openssl/ssl')

diff --git a/crypto/openssl/ssl/t1_lib.c b/crypto/openssl/ssl/t1_lib.c
index c2d7d72..d70b93f 100644
--- a/crypto/openssl/ssl/t1_lib.c
+++ b/crypto/openssl/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))
-- 
cgit v1.1