From aa46916ffff53f4d8fa6bd701c96da70c82b1547 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Thu, 30 Aug 2018 16:56:16 +0000
Subject: Nuke ssl_pending/ssl_shutdown function pointers.

ssl3_pending() is used for all protocols and dtls1_shutdown() just calls
ssl3_shutdown(), so just call the appropriate function directly instead.

ok beck@ inoguchi@ tb@
---
 src/lib/libssl/t1_clnt.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'src/lib/libssl/t1_clnt.c')

diff --git a/src/lib/libssl/t1_clnt.c b/src/lib/libssl/t1_clnt.c
index 90188e0ec3..4e3b208743 100644
--- a/src/lib/libssl/t1_clnt.c
+++ b/src/lib/libssl/t1_clnt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t1_clnt.c,v 1.25 2018/04/07 17:02:34 jsing Exp $ */
+/* $OpenBSD: t1_clnt.c,v 1.26 2018/08/30 16:56:16 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -73,8 +73,6 @@ static const SSL_METHOD_INTERNAL TLS_client_method_internal_data = {
 	.ssl_free = tls1_free,
 	.ssl_accept = ssl_undefined_function,
 	.ssl_connect = ssl3_connect,
-	.ssl_shutdown = ssl3_shutdown,
-	.ssl_pending = ssl3_pending,
 	.get_ssl_method = tls1_get_client_method,
 	.get_timeout = tls1_default_timeout,
 	.ssl_version = ssl_undefined_void_function,
@@ -104,8 +102,6 @@ static const SSL_METHOD_INTERNAL TLSv1_client_method_internal_data = {
 	.ssl_free = tls1_free,
 	.ssl_accept = ssl_undefined_function,
 	.ssl_connect = ssl3_connect,
-	.ssl_shutdown = ssl3_shutdown,
-	.ssl_pending = ssl3_pending,
 	.get_ssl_method = tls1_get_client_method,
 	.get_timeout = tls1_default_timeout,
 	.ssl_version = ssl_undefined_void_function,
@@ -135,8 +131,6 @@ static const SSL_METHOD_INTERNAL TLSv1_1_client_method_internal_data = {
 	.ssl_free = tls1_free,
 	.ssl_accept = ssl_undefined_function,
 	.ssl_connect = ssl3_connect,
-	.ssl_shutdown = ssl3_shutdown,
-	.ssl_pending = ssl3_pending,
 	.get_ssl_method = tls1_get_client_method,
 	.get_timeout = tls1_default_timeout,
 	.ssl_version = ssl_undefined_void_function,
@@ -166,8 +160,6 @@ static const SSL_METHOD_INTERNAL TLSv1_2_client_method_internal_data = {
 	.ssl_free = tls1_free,
 	.ssl_accept = ssl_undefined_function,
 	.ssl_connect = ssl3_connect,
-	.ssl_shutdown = ssl3_shutdown,
-	.ssl_pending = ssl3_pending,
 	.get_ssl_method = tls1_get_client_method,
 	.get_timeout = tls1_default_timeout,
 	.ssl_version = ssl_undefined_void_function,
-- 
cgit v1.2.3-55-g6feb