diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/s23_clnt.c | 12 | 
1 files changed, 6 insertions, 6 deletions
| diff --git a/src/lib/libssl/s23_clnt.c b/src/lib/libssl/s23_clnt.c index 00954777fc..458eb37d5f 100644 --- a/src/lib/libssl/s23_clnt.c +++ b/src/lib/libssl/s23_clnt.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: s23_clnt.c,v 1.39 2015/07/19 06:31:32 doug Exp $ */ | 1 | /* $OpenBSD: s23_clnt.c,v 1.40 2015/07/19 07:30:06 doug Exp $ */ | 
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 
| 3 | * All rights reserved. | 3 | * All rights reserved. | 
| 4 | * | 4 | * | 
| @@ -120,7 +120,7 @@ | |||
| 120 | static const SSL_METHOD *ssl23_get_client_method(int ver); | 120 | static const SSL_METHOD *ssl23_get_client_method(int ver); | 
| 121 | static int ssl23_client_hello(SSL *s); | 121 | static int ssl23_client_hello(SSL *s); | 
| 122 | static int ssl23_get_server_hello(SSL *s); | 122 | static int ssl23_get_server_hello(SSL *s); | 
| 123 | static const SSL_METHOD *tls_get_client_method(int ver); | 123 | static const SSL_METHOD *tls_any_get_client_method(int ver); | 
| 124 | 124 | ||
| 125 | const SSL_METHOD SSLv23_client_method_data = { | 125 | const SSL_METHOD SSLv23_client_method_data = { | 
| 126 | .version = TLS1_2_VERSION, | 126 | .version = TLS1_2_VERSION, | 
| @@ -160,7 +160,7 @@ const SSL_METHOD TLS_client_method_data = { | |||
| 160 | .ssl_clear = tls1_clear, | 160 | .ssl_clear = tls1_clear, | 
| 161 | .ssl_free = tls1_free, | 161 | .ssl_free = tls1_free, | 
| 162 | .ssl_accept = ssl_undefined_function, | 162 | .ssl_accept = ssl_undefined_function, | 
| 163 | .ssl_connect = tls_connect, | 163 | .ssl_connect = tls_any_connect, | 
| 164 | .ssl_read = ssl23_read, | 164 | .ssl_read = ssl23_read, | 
| 165 | .ssl_peek = ssl23_peek, | 165 | .ssl_peek = ssl23_peek, | 
| 166 | .ssl_write = ssl23_write, | 166 | .ssl_write = ssl23_write, | 
| @@ -178,7 +178,7 @@ const SSL_METHOD TLS_client_method_data = { | |||
| 178 | .ssl_pending = ssl_undefined_const_function, | 178 | .ssl_pending = ssl_undefined_const_function, | 
| 179 | .num_ciphers = ssl3_num_ciphers, | 179 | .num_ciphers = ssl3_num_ciphers, | 
| 180 | .get_cipher = ssl3_get_cipher, | 180 | .get_cipher = ssl3_get_cipher, | 
| 181 | .get_ssl_method = tls_get_client_method, | 181 | .get_ssl_method = tls_any_get_client_method, | 
| 182 | .get_timeout = ssl23_default_timeout, | 182 | .get_timeout = ssl23_default_timeout, | 
| 183 | .ssl3_enc = &ssl3_undef_enc_method, | 183 | .ssl3_enc = &ssl3_undef_enc_method, | 
| 184 | .ssl_version = ssl_undefined_void_function, | 184 | .ssl_version = ssl_undefined_void_function, | 
| @@ -586,7 +586,7 @@ TLS_client_method(void) | |||
| 586 | } | 586 | } | 
| 587 | 587 | ||
| 588 | static const SSL_METHOD * | 588 | static const SSL_METHOD * | 
| 589 | tls_get_client_method(int ver) | 589 | tls_any_get_client_method(int ver) | 
| 590 | { | 590 | { | 
| 591 | if (ver == SSL3_VERSION) | 591 | if (ver == SSL3_VERSION) | 
| 592 | return (NULL); | 592 | return (NULL); | 
| @@ -595,7 +595,7 @@ tls_get_client_method(int ver) | |||
| 595 | } | 595 | } | 
| 596 | 596 | ||
| 597 | int | 597 | int | 
| 598 | tls_connect(SSL *s) | 598 | tls_any_connect(SSL *s) | 
| 599 | { | 599 | { | 
| 600 | int ret; | 600 | int ret; | 
| 601 | unsigned long old_options; | 601 | unsigned long old_options; | 
