Remove function pointers for ssl_{read,write,peek}.

Now that everything goes through the same code path, we can remove a layer
of indirection and just call ssl3_{read,write,peek} directly.

ok beck@ inoguchi@

1 files changed, 1 insertions, 13 deletions

diff --git a/src/lib/libssl/t1_srvr.c b/src/lib/libssl/t1_srvr.c
index 1fc0ebe6f7..c8b65086dc 100644
--- a/src/lib/libssl/t1_srvr.c
+++ b/src/lib/libssl/t1_srvr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t1_srvr.c,v 1.25 2017/01/26 05:31:25 jsing Exp $ */
+/* $OpenBSD: t1_srvr.c,v 1.26 2018/04/07 17:02:34 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -74,9 +74,6 @@ static const SSL_METHOD_INTERNAL TLS_server_method_internal_data = {
         .ssl_free = tls1_free,
         .ssl_accept = ssl3_accept,
         .ssl_connect = ssl_undefined_function,
-        .ssl_read = ssl3_read,
-        .ssl_peek = ssl3_peek,
-        .ssl_write = ssl3_write,
         .ssl_shutdown = ssl3_shutdown,
         .ssl_pending = ssl3_pending,
         .get_ssl_method = tls1_get_server_method,
@@ -108,9 +105,6 @@ static const SSL_METHOD_INTERNAL TLSv1_server_method_internal_data = {
         .ssl_free = tls1_free,
         .ssl_accept = ssl3_accept,
         .ssl_connect = ssl_undefined_function,
-        .ssl_read = ssl3_read,
-        .ssl_peek = ssl3_peek,
-        .ssl_write = ssl3_write,
         .ssl_shutdown = ssl3_shutdown,
         .ssl_pending = ssl3_pending,
         .get_ssl_method = tls1_get_server_method,
@@ -142,9 +136,6 @@ static const SSL_METHOD_INTERNAL TLSv1_1_server_method_internal_data = {
         .ssl_free = tls1_free,
         .ssl_accept = ssl3_accept,
         .ssl_connect = ssl_undefined_function,
-        .ssl_read = ssl3_read,
-        .ssl_peek = ssl3_peek,
-        .ssl_write = ssl3_write,
         .ssl_shutdown = ssl3_shutdown,
         .ssl_pending = ssl3_pending,
         .get_ssl_method = tls1_get_server_method,
@@ -176,9 +167,6 @@ static const SSL_METHOD_INTERNAL TLSv1_2_server_method_internal_data = {
         .ssl_free = tls1_free,
         .ssl_accept = ssl3_accept,
         .ssl_connect = ssl_undefined_function,
-        .ssl_read = ssl3_read,
-        .ssl_peek = ssl3_peek,
-        .ssl_write = ssl3_write,
         .ssl_shutdown = ssl3_shutdown,
         .ssl_pending = ssl3_pending,
         .get_ssl_method = tls1_get_server_method,