From 192f5b50e32ed14945317325a5465f40abfcc587 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Tue, 28 Oct 2014 23:07:58 +0100
Subject: Update Openssl to aosp/master (includes useless (for OpenVPN)) SSLv3
 Fallback fix

--HG--
extra : rebase_source : 4ec3b7a7844aa1ca198c4538ecdf28f027ceb1b1
---
 main/openssl/ssl/s23_srvr.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'main/openssl/ssl/s23_srvr.c')

diff --git a/main/openssl/ssl/s23_srvr.c b/main/openssl/ssl/s23_srvr.c
index 48778490..82d6867b 100644
--- a/main/openssl/ssl/s23_srvr.c
+++ b/main/openssl/ssl/s23_srvr.c
@@ -425,6 +425,9 @@ int ssl23_get_client_hello(SSL *s)
 			}
 		}
 
+	/* ensure that TLS_MAX_VERSION is up-to-date */
+	OPENSSL_assert(s->version <= TLS_MAX_VERSION);
+
 #ifdef OPENSSL_FIPS
 	if (FIPS_mode() && (s->version < TLS1_VERSION))
 		{
-- 
cgit v1.2.3