summaryrefslogtreecommitdiff
path: root/src/lib/libssl/s23_srvr.c
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/lib/libssl/s23_srvr.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libssl/s23_srvr.c b/src/lib/libssl/s23_srvr.c
index f1914e0e8e..b524124681 100644
--- a/src/lib/libssl/s23_srvr.c
+++ b/src/lib/libssl/s23_srvr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s23_srvr.c,v 1.40 2015/07/19 06:31:32 doug Exp $ */ 1/* $OpenBSD: s23_srvr.c,v 1.41 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 *
@@ -119,7 +119,7 @@
119 119
120static const SSL_METHOD *ssl23_get_server_method(int ver); 120static const SSL_METHOD *ssl23_get_server_method(int ver);
121int ssl23_get_client_hello(SSL *s); 121int ssl23_get_client_hello(SSL *s);
122static const SSL_METHOD *tls_get_server_method(int ver); 122static const SSL_METHOD *tls_any_get_server_method(int ver);
123 123
124const SSL_METHOD SSLv23_server_method_data = { 124const SSL_METHOD SSLv23_server_method_data = {
125 .version = TLS1_2_VERSION, 125 .version = TLS1_2_VERSION,
@@ -158,7 +158,7 @@ const SSL_METHOD TLS_server_method_data = {
158 .ssl_new = tls1_new, 158 .ssl_new = tls1_new,
159 .ssl_clear = tls1_clear, 159 .ssl_clear = tls1_clear,
160 .ssl_free = tls1_free, 160 .ssl_free = tls1_free,
161 .ssl_accept = tls_accept, 161 .ssl_accept = tls_any_accept,
162 .ssl_connect = ssl_undefined_function, 162 .ssl_connect = ssl_undefined_function,
163 .ssl_read = ssl23_read, 163 .ssl_read = ssl23_read,
164 .ssl_peek = ssl23_peek, 164 .ssl_peek = ssl23_peek,
@@ -177,7 +177,7 @@ const SSL_METHOD TLS_server_method_data = {
177 .ssl_pending = ssl_undefined_const_function, 177 .ssl_pending = ssl_undefined_const_function,
178 .num_ciphers = ssl3_num_ciphers, 178 .num_ciphers = ssl3_num_ciphers,
179 .get_cipher = ssl3_get_cipher, 179 .get_cipher = ssl3_get_cipher,
180 .get_ssl_method = tls_get_server_method, 180 .get_ssl_method = tls_any_get_server_method,
181 .get_timeout = ssl23_default_timeout, 181 .get_timeout = ssl23_default_timeout,
182 .ssl3_enc = &ssl3_undef_enc_method, 182 .ssl3_enc = &ssl3_undef_enc_method,
183 .ssl_version = ssl_undefined_void_function, 183 .ssl_version = ssl_undefined_void_function,
@@ -611,7 +611,7 @@ TLS_server_method(void)
611} 611}
612 612
613static const SSL_METHOD * 613static const SSL_METHOD *
614tls_get_server_method(int ver) 614tls_any_get_server_method(int ver)
615{ 615{
616 if (ver == SSL3_VERSION) 616 if (ver == SSL3_VERSION)
617 return (NULL); 617 return (NULL);
@@ -620,7 +620,7 @@ tls_get_server_method(int ver)
620} 620}
621 621
622int 622int
623tls_accept(SSL *s) 623tls_any_accept(SSL *s)
624{ 624{
625 int ret; 625 int ret;
626 unsigned long old_options; 626 unsigned long old_options;