Use appropriate versions of SSL3_ENC_METHOD

Author: snhenson

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, \

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)
 

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)
 

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)