resolve conflicts

1 files changed, 17 insertions, 4 deletions

diff --git a/src/lib/libssl/t1_srvr.c b/src/lib/libssl/t1_srvr.c
index 42525e9e89..f1d1565769 100644
--- a/src/lib/libssl/t1_srvr.c
+++ b/src/lib/libssl/t1_srvr.c
@@ -67,13 +67,26 @@
 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());
-        else
-                return(NULL);
+                return TLSv1_server_method();
+        return NULL;
         }
 
-IMPLEMENT_tls1_meth_func(TLSv1_server_method,
+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,
                         ssl3_accept,
                         ssl_undefined_function,
                         tls1_get_server_method)