#14465: Update openssl to tag android-4.0.4_r2.1
diff --git a/jni/openssl/ssl/t1_srvr.c b/jni/openssl/ssl/t1_srvr.c
index f1d1565..42525e9 100644
--- a/jni/openssl/ssl/t1_srvr.c
+++ b/jni/openssl/ssl/t1_srvr.c
@@ -67,26 +67,13 @@
static const SSL_METHOD *tls1_get_server_method(int ver);
static const SSL_METHOD *tls1_get_server_method(int ver)
{
- if (ver == TLS1_2_VERSION)
- return TLSv1_2_server_method();
- if (ver == TLS1_1_VERSION)
- return TLSv1_1_server_method();
if (ver == TLS1_VERSION)
- return TLSv1_server_method();
- return NULL;
+ return(TLSv1_server_method());
+ else
+ return(NULL);
}
-IMPLEMENT_tls_meth_func(TLS1_2_VERSION, TLSv1_2_server_method,
- ssl3_accept,
- ssl_undefined_function,
- tls1_get_server_method)
-
-IMPLEMENT_tls_meth_func(TLS1_1_VERSION, TLSv1_1_server_method,
- ssl3_accept,
- ssl_undefined_function,
- tls1_get_server_method)
-
-IMPLEMENT_tls_meth_func(TLS1_VERSION, TLSv1_server_method,
+IMPLEMENT_tls1_meth_func(TLSv1_server_method,
ssl3_accept,
ssl_undefined_function,
tls1_get_server_method)