diff options
Diffstat (limited to 'lib/libssl/s23_clnt.c')
| -rw-r--r-- | lib/libssl/s23_clnt.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/libssl/s23_clnt.c b/lib/libssl/s23_clnt.c index 00954777fcd..458eb37d5f2 100644 --- a/lib/libssl/s23_clnt.c +++ b/lib/libssl/s23_clnt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s23_clnt.c,v 1.39 2015/07/19 06:31:32 doug Exp $ */ +/* $OpenBSD: s23_clnt.c,v 1.40 2015/07/19 07:30:06 doug Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -120,7 +120,7 @@ static const SSL_METHOD *ssl23_get_client_method(int ver); static int ssl23_client_hello(SSL *s); static int ssl23_get_server_hello(SSL *s); -static const SSL_METHOD *tls_get_client_method(int ver); +static const SSL_METHOD *tls_any_get_client_method(int ver); const SSL_METHOD SSLv23_client_method_data = { .version = TLS1_2_VERSION, @@ -160,7 +160,7 @@ const SSL_METHOD TLS_client_method_data = { .ssl_clear = tls1_clear, .ssl_free = tls1_free, .ssl_accept = ssl_undefined_function, - .ssl_connect = tls_connect, + .ssl_connect = tls_any_connect, .ssl_read = ssl23_read, .ssl_peek = ssl23_peek, .ssl_write = ssl23_write, @@ -178,7 +178,7 @@ const SSL_METHOD TLS_client_method_data = { .ssl_pending = ssl_undefined_const_function, .num_ciphers = ssl3_num_ciphers, .get_cipher = ssl3_get_cipher, - .get_ssl_method = tls_get_client_method, + .get_ssl_method = tls_any_get_client_method, .get_timeout = ssl23_default_timeout, .ssl3_enc = &ssl3_undef_enc_method, .ssl_version = ssl_undefined_void_function, @@ -586,7 +586,7 @@ TLS_client_method(void) } static const SSL_METHOD * -tls_get_client_method(int ver) +tls_any_get_client_method(int ver) { if (ver == SSL3_VERSION) return (NULL); @@ -595,7 +595,7 @@ tls_get_client_method(int ver) } int -tls_connect(SSL *s) +tls_any_connect(SSL *s) { int ret; unsigned long old_options; |