diff options
Diffstat (limited to 'lib/libssl/src/ssl/t1_clnt.c')
| -rw-r--r-- | lib/libssl/src/ssl/t1_clnt.c | 76 |
1 files changed, 60 insertions, 16 deletions
diff --git a/lib/libssl/src/ssl/t1_clnt.c b/lib/libssl/src/ssl/t1_clnt.c index 0dc41af5b38..0853a3cb33a 100644 --- a/lib/libssl/src/ssl/t1_clnt.c +++ b/lib/libssl/src/ssl/t1_clnt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t1_clnt.c,v 1.17 2015/02/06 08:30:23 jsing Exp $ */ +/* $OpenBSD: t1_clnt.c,v 1.18 2015/09/11 14:39:05 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -66,6 +66,38 @@ static const SSL_METHOD *tls1_get_client_method(int ver); +const SSL_METHOD TLS_client_method_data = { + .version = TLS1_2_VERSION, + .ssl_new = tls1_new, + .ssl_clear = tls1_clear, + .ssl_free = tls1_free, + .ssl_accept = ssl_undefined_function, + .ssl_connect = ssl23_connect, + .ssl_read = ssl23_read, + .ssl_peek = ssl23_peek, + .ssl_write = ssl23_write, + .ssl_shutdown = ssl_undefined_function, + .ssl_renegotiate = ssl_undefined_function, + .ssl_renegotiate_check = ssl_ok, + .ssl_get_message = ssl3_get_message, + .ssl_read_bytes = ssl3_read_bytes, + .ssl_write_bytes = ssl3_write_bytes, + .ssl_dispatch_alert = ssl3_dispatch_alert, + .ssl_ctrl = ssl3_ctrl, + .ssl_ctx_ctrl = ssl3_ctx_ctrl, + .get_cipher_by_char = ssl3_get_cipher_by_char, + .put_cipher_by_char = ssl3_put_cipher_by_char, + .ssl_pending = ssl_undefined_const_function, + .num_ciphers = ssl3_num_ciphers, + .get_cipher = ssl3_get_cipher, + .get_ssl_method = tls1_get_client_method, + .get_timeout = ssl23_default_timeout, + .ssl3_enc = &ssl3_undef_enc_method, + .ssl_version = ssl_undefined_void_function, + .ssl_callback_ctrl = ssl3_callback_ctrl, + .ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl, +}; + const SSL_METHOD TLSv1_client_method_data = { .version = TLS1_VERSION, .ssl_new = tls1_new, @@ -162,32 +194,44 @@ const SSL_METHOD TLSv1_2_client_method_data = { .ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl, }; +static const SSL_METHOD * +tls1_get_client_method(int ver) +{ + if (ver == TLS1_2_VERSION) + return (TLSv1_2_client_method()); + if (ver == TLS1_1_VERSION) + return (TLSv1_1_client_method()); + if (ver == TLS1_VERSION) + return (TLSv1_client_method()); + return (NULL); +} + const SSL_METHOD * -TLSv1_client_method(void) +SSLv23_client_method(void) { - return &TLSv1_client_method_data; + return (TLS_client_method()); } const SSL_METHOD * -TLSv1_1_client_method(void) +TLS_client_method(void) { - return &TLSv1_1_client_method_data; + return (&TLS_client_method_data); } const SSL_METHOD * -TLSv1_2_client_method(void) +TLSv1_client_method(void) { - return &TLSv1_2_client_method_data; + return (&TLSv1_client_method_data); } -static const SSL_METHOD * -tls1_get_client_method(int ver) +const SSL_METHOD * +TLSv1_1_client_method(void) { - if (ver == TLS1_2_VERSION) - return (TLSv1_2_client_method()); - if (ver == TLS1_1_VERSION) - return (TLSv1_1_client_method()); - if (ver == TLS1_VERSION) - return (TLSv1_client_method()); - return (NULL); + return (&TLSv1_1_client_method_data); +} + +const SSL_METHOD * +TLSv1_2_client_method(void) +{ + return (&TLSv1_2_client_method_data); } |