Clarify CMS_decrypt behaviour.

[openssl.git] / ssl / t1_srvr.c

diff --git a/ssl/t1_srvr.c b/ssl/t1_srvr.c
index 274a3d6738c7cc2f0856f20b1a2f10cfd336ff8c..a1858cf1b07f82677b5380458a0a170dd16e2d7e 100644 (file)
--- a/ssl/t1_srvr.c
+++ b/ssl/t1_srvr.c
@@ -67,6 +67,8 @@
 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)
@@ -74,13 +76,21 @@ static const SSL_METHOD *tls1_get_server_method(int ver)
        return NULL;
        }
 
+IMPLEMENT_tls_meth_func(TLS1_2_VERSION, TLSv1_2_server_method,
+                       ssl3_accept,
+                       ssl_undefined_function,
+                       tls1_get_server_method,
+                       TLSv1_2_enc_data)
+
 IMPLEMENT_tls_meth_func(TLS1_1_VERSION, TLSv1_1_server_method,
                        ssl3_accept,
                        ssl_undefined_function,
-                       tls1_get_server_method)
+                       tls1_get_server_method,
+                       TLSv1_1_enc_data)
 
 IMPLEMENT_tls_meth_func(TLS1_VERSION, TLSv1_server_method,
                        ssl3_accept,
                        ssl_undefined_function,
-                       tls1_get_server_method)
+                       tls1_get_server_method,
+                       TLSv1_enc_data)