diff options
author | Arne Schwabe <arne@rfc2549.org> | 2014-10-28 23:07:58 +0100 |
---|---|---|
committer | Arne Schwabe <arne@rfc2549.org> | 2014-10-28 23:07:58 +0100 |
commit | 192f5b50e32ed14945317325a5465f40abfcc587 (patch) | |
tree | c58aa6ba75e3c0acaa4f9d91ab62efecf8d838bc /main/openssl/ssl/s23_clnt.c | |
parent | 22feeb602f32f1d58f4aa5168b5fc139e086e85d (diff) |
Update Openssl to aosp/master (includes useless (for OpenVPN)) SSLv3 Fallback fix
--HG--
extra : rebase_source : 4ec3b7a7844aa1ca198c4538ecdf28f027ceb1b1
Diffstat (limited to 'main/openssl/ssl/s23_clnt.c')
-rw-r--r-- | main/openssl/ssl/s23_clnt.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/main/openssl/ssl/s23_clnt.c b/main/openssl/ssl/s23_clnt.c index 2bc92141..467adfea 100644 --- a/main/openssl/ssl/s23_clnt.c +++ b/main/openssl/ssl/s23_clnt.c @@ -736,6 +736,9 @@ static int ssl23_get_server_hello(SSL *s) goto err; } + /* ensure that TLS_MAX_VERSION is up-to-date */ + OPENSSL_assert(s->version <= TLS_MAX_VERSION); + if (p[0] == SSL3_RT_ALERT && p[5] != SSL3_AL_WARNING) { /* fatal alert */ |