diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2013-03-13 13:30:44 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2013-09-18 13:46:02 +0100 |
| commit | d88d98edd361eda5fc254e0b3dd24e682cb60983 (patch) | |
| tree | a355c02a85c36fa72a8005f1de9acaa0545db029 /ssl | |
| parent | 741c9959f621a383055816cb3db37a61fee889e5 (diff) | |
Use appropriate versions of SSL3_ENC_METHOD
(cherry picked from commit 6de2649a6b349bde9c9fb62c3a3d5d6344d8259c)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssl_locl.h | 4 | ||||
| -rw-r--r-- | ssl/t1_clnt.c | 9 | ||||
| -rw-r--r-- | ssl/t1_meth.c | 9 | ||||
| -rw-r--r-- | ssl/t1_srvr.c | 9 |
4 files changed, 20 insertions, 11 deletions
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index bb3e18ef88..920c4f209f 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -752,7 +752,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= { \ @@ -781,7 +781,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 578617ed84..e7998d1d9e 100644 --- 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 53c807de28..5162678358 100644 --- 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 f1d1565769..a1858cf1b0 100644 --- 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) |