Use appropriate versions of SSL3_ENC_METHOD

diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 9f3a5c9f7b1843f62de1e68bfeb929ef55ca0c0a..b4d84a0f0df0f72c88021e27d2b5ba25f27bb8fa 100644 (file)
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -743,7 +743,7 @@ extern SSL3_ENC_METHOD SSLv3_enc_data;
 extern SSL3_ENC_METHOD DTLSv1_enc_data;
 
 #define IMPLEMENT_tls_meth_func(version, func_name, s_accept, s_connect, \
-                               s_get_meth) \
+                               s_get_meth, enc_data) \
 const SSL_METHOD *func_name(void)  \
        { \
        static const SSL_METHOD func_name##_data= { \
@@ -772,7 +772,7 @@ const SSL_METHOD *func_name(void)  \
                ssl3_get_cipher, \
                s_get_meth, \
                tls1_default_timeout, \
-               &TLSv1_enc_data, \
+               &enc_data, \
                ssl_undefined_void_function, \
                ssl3_callback_ctrl, \
                ssl3_ctx_callback_ctrl, \

diff --git a/ssl/t1_clnt.c b/ssl/t1_clnt.c
index 578617ed84b47f4a361126553d5d99d0c26d26e0..e7998d1d9e92ca8a7f90508a23207e5e3b1e34a8 100644 (file)
--- a/ssl/t1_clnt.c
+++ b/ssl/t1_clnt.c
@@ -78,15 +78,18 @@ static const SSL_METHOD *tls1_get_client_method(int ver)
 IMPLEMENT_tls_meth_func(TLS1_2_VERSION, TLSv1_2_client_method,
                        ssl_undefined_function,
                        ssl3_connect,
-                       tls1_get_client_method)
+                       tls1_get_client_method,
+                       TLSv1_2_enc_data)
 
 IMPLEMENT_tls_meth_func(TLS1_1_VERSION, TLSv1_1_client_method,
                        ssl_undefined_function,
                        ssl3_connect,
-                       tls1_get_client_method)
+                       tls1_get_client_method,
+                       TLSv1_1_enc_data)
 
 IMPLEMENT_tls_meth_func(TLS1_VERSION, TLSv1_client_method,
                        ssl_undefined_function,
                        ssl3_connect,
-                       tls1_get_client_method)
+                       tls1_get_client_method,
+                       TLSv1_enc_data)
 

diff --git a/ssl/t1_meth.c b/ssl/t1_meth.c
index 53c807de28097b0a008ddb8bd689fac179d0a94f..51626783588fa026bce7d3ebee2a831f2cc32a0a 100644 (file)
--- a/ssl/t1_meth.c
+++ b/ssl/t1_meth.c
@@ -74,15 +74,18 @@ static const SSL_METHOD *tls1_get_method(int ver)
 IMPLEMENT_tls_meth_func(TLS1_2_VERSION, TLSv1_2_method,
                        ssl3_accept,
                        ssl3_connect,
-                       tls1_get_method)
+                       tls1_get_method,
+                       TLSv1_2_enc_data)
 
 IMPLEMENT_tls_meth_func(TLS1_1_VERSION, TLSv1_1_method,
                        ssl3_accept,
                        ssl3_connect,
-                       tls1_get_method)
+                       tls1_get_method,
+                       TLSv1_1_enc_data)
 
 IMPLEMENT_tls_meth_func(TLS1_VERSION, TLSv1_method,
                        ssl3_accept,
                        ssl3_connect,
-                       tls1_get_method)
+                       tls1_get_method,
+                       TLSv1_enc_data)
 

diff --git a/ssl/t1_srvr.c b/ssl/t1_srvr.c
index f1d156576916d5b92d11916c11063f1d329572ae..a1858cf1b07f82677b5380458a0a170dd16e2d7e 100644 (file)
--- a/ssl/t1_srvr.c
+++ b/ssl/t1_srvr.c
@@ -79,15 +79,18 @@ static const SSL_METHOD *tls1_get_server_method(int ver)
 IMPLEMENT_tls_meth_func(TLS1_2_VERSION, TLSv1_2_server_method,
                        ssl3_accept,
                        ssl_undefined_function,
-                       tls1_get_server_method)
+                       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)