generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use appropriate versions of SSL3_ENC_METHOD

Browse Source 
(cherry picked from commit 6de2649a6b349bde9c9fb62c3a3d5d6344d8259c)
This commit is contained in:
Dr. Stephen Henson 2013-03-13 13:30:44 +00:00
parent 741c9959f6
commit d88d98edd3
4 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ssl/ssl_locl.h
View File

@ -752,7 +752,7 @@ extern SSL3_ENC_METHOD SSLv3_enc_data;
extern SSL3_ENC_METHOD DTLSv1_enc_data; extern SSL3_ENC_METHOD DTLSv1_enc_data;
#define IMPLEMENT_tls_meth_func(version, func_name, s_accept, s_connect, \ #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) \ const SSL_METHOD *func_name(void) \
{ \ { \
static const SSL_METHOD func_name##_data= { \ static const SSL_METHOD func_name##_data= { \
@ -781,7 +781,7 @@ const SSL_METHOD *func_name(void) \
ssl3_get_cipher, \ ssl3_get_cipher, \
s_get_meth, \ s_get_meth, \
tls1_default_timeout, \ tls1_default_timeout, \
&TLSv1_enc_data, \ &enc_data, \
ssl_undefined_void_function, \ ssl_undefined_void_function, \
ssl3_callback_ctrl, \ ssl3_callback_ctrl, \
ssl3_ctx_callback_ctrl, \ ssl3_ctx_callback_ctrl, \

9
ssl/t1_clnt.c
View File

@ -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, IMPLEMENT_tls_meth_func(TLS1_2_VERSION, TLSv1_2_client_method,
ssl_undefined_function, ssl_undefined_function,
ssl3_connect, 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, IMPLEMENT_tls_meth_func(TLS1_1_VERSION, TLSv1_1_client_method,
ssl_undefined_function, ssl_undefined_function,
ssl3_connect, ssl3_connect,
tls1_get_client_method) tls1_get_client_method,
TLSv1_1_enc_data)
IMPLEMENT_tls_meth_func(TLS1_VERSION, TLSv1_client_method, IMPLEMENT_tls_meth_func(TLS1_VERSION, TLSv1_client_method,
ssl_undefined_function, ssl_undefined_function,
ssl3_connect, ssl3_connect,
tls1_get_client_method) tls1_get_client_method,
TLSv1_enc_data)

9
ssl/t1_meth.c
View File

@ -74,15 +74,18 @@ static const SSL_METHOD *tls1_get_method(int ver)
IMPLEMENT_tls_meth_func(TLS1_2_VERSION, TLSv1_2_method, IMPLEMENT_tls_meth_func(TLS1_2_VERSION, TLSv1_2_method,
ssl3_accept, ssl3_accept,
ssl3_connect, ssl3_connect,
tls1_get_method) tls1_get_method,
TLSv1_2_enc_data)
IMPLEMENT_tls_meth_func(TLS1_1_VERSION, TLSv1_1_method, IMPLEMENT_tls_meth_func(TLS1_1_VERSION, TLSv1_1_method,
ssl3_accept, ssl3_accept,
ssl3_connect, ssl3_connect,
tls1_get_method) tls1_get_method,
TLSv1_1_enc_data)
IMPLEMENT_tls_meth_func(TLS1_VERSION, TLSv1_method, IMPLEMENT_tls_meth_func(TLS1_VERSION, TLSv1_method,
ssl3_accept, ssl3_accept,
ssl3_connect, ssl3_connect,
tls1_get_method) tls1_get_method,
TLSv1_enc_data)

9
ssl/t1_srvr.c
View File

@ -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, IMPLEMENT_tls_meth_func(TLS1_2_VERSION, TLSv1_2_server_method,
ssl3_accept, ssl3_accept,
ssl_undefined_function, 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, IMPLEMENT_tls_meth_func(TLS1_1_VERSION, TLSv1_1_server_method,
ssl3_accept, ssl3_accept,
ssl_undefined_function, ssl_undefined_function,
tls1_get_server_method) tls1_get_server_method,
TLSv1_1_enc_data)
IMPLEMENT_tls_meth_func(TLS1_VERSION, TLSv1_server_method, IMPLEMENT_tls_meth_func(TLS1_VERSION, TLSv1_server_method,
ssl3_accept, ssl3_accept,
ssl_undefined_function, ssl_undefined_function,
tls1_get_server_method) tls1_get_server_method,
TLSv1_enc_data)