From 2e3ba6ffb663e8c3e72862f39176110970a03b64 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sun, 17 Nov 2019 19:07:07 +0000
Subject: Bring back the ssl_shutdown internal method pointer.

For now ssl3_shutdown() is called in all cases, however TLSv1.3 will soon
get its own version.

ok beck@
---
 src/lib/libssl/ssl_methods.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

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

diff --git a/src/lib/libssl/ssl_methods.c b/src/lib/libssl/ssl_methods.c
index df99d98c8a..5a62a7adc4 100644
--- a/src/lib/libssl/ssl_methods.c
+++ b/src/lib/libssl/ssl_methods.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_methods.c,v 1.4 2019/03/17 17:28:08 jsing Exp $ */
+/* $OpenBSD: ssl_methods.c,v 1.5 2019/11/17 19:07:07 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -68,6 +68,7 @@ static const SSL_METHOD_INTERNAL DTLSv1_client_method_internal_data = {
 	.ssl_free = dtls1_free,
 	.ssl_accept = ssl_undefined_function,
 	.ssl_connect = ssl3_connect,
+	.ssl_shutdown = ssl3_shutdown,
 	.get_ssl_method = dtls1_get_client_method,
 	.get_timeout = dtls1_default_timeout,
 	.ssl_version = ssl_undefined_void_function,
@@ -119,6 +120,7 @@ static const SSL_METHOD_INTERNAL DTLSv1_method_internal_data = {
 	.ssl_free = dtls1_free,
 	.ssl_accept = ssl3_accept,
 	.ssl_connect = ssl3_connect,
+	.ssl_shutdown = ssl3_shutdown,
 	.get_ssl_method = dtls1_get_method,
 	.get_timeout = dtls1_default_timeout,
 	.ssl_version = ssl_undefined_void_function,
@@ -168,6 +170,7 @@ static const SSL_METHOD_INTERNAL DTLSv1_server_method_internal_data = {
 	.ssl_free = dtls1_free,
 	.ssl_accept = ssl3_accept,
 	.ssl_connect = ssl_undefined_function,
+	.ssl_shutdown = ssl3_shutdown,
 	.get_ssl_method = dtls1_get_server_method,
 	.get_timeout = dtls1_default_timeout,
 	.ssl_version = ssl_undefined_void_function,
@@ -218,6 +221,7 @@ static const SSL_METHOD_INTERNAL TLS_client_method_internal_data = {
 	.ssl_free = tls1_free,
 	.ssl_accept = ssl_undefined_function,
 	.ssl_connect = tls13_legacy_connect,
+	.ssl_shutdown = ssl3_shutdown,
 	.get_ssl_method = tls1_get_client_method,
 	.get_timeout = tls1_default_timeout,
 	.ssl_version = ssl_undefined_void_function,
@@ -248,6 +252,7 @@ static const SSL_METHOD_INTERNAL TLS_legacy_client_method_internal_data = {
 	.ssl_free = tls1_free,
 	.ssl_accept = ssl_undefined_function,
 	.ssl_connect = ssl3_connect,
+	.ssl_shutdown = ssl3_shutdown,
 	.get_ssl_method = tls1_get_client_method,
 	.get_timeout = tls1_default_timeout,
 	.ssl_version = ssl_undefined_void_function,
@@ -277,6 +282,7 @@ 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,
 	.get_ssl_method = tls1_get_client_method,
 	.get_timeout = tls1_default_timeout,
 	.ssl_version = ssl_undefined_void_function,
@@ -306,6 +312,7 @@ 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,
 	.get_ssl_method = tls1_get_client_method,
 	.get_timeout = tls1_default_timeout,
 	.ssl_version = ssl_undefined_void_function,
@@ -335,6 +342,7 @@ 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,
 	.get_ssl_method = tls1_get_client_method,
 	.get_timeout = tls1_default_timeout,
 	.ssl_version = ssl_undefined_void_function,
@@ -418,6 +426,7 @@ static const SSL_METHOD_INTERNAL TLS_method_internal_data = {
 	.ssl_free = tls1_free,
 	.ssl_accept = ssl3_accept,
 	.ssl_connect = ssl3_connect,
+	.ssl_shutdown = ssl3_shutdown,
 	.get_ssl_method = tls1_get_method,
 	.get_timeout = tls1_default_timeout,
 	.ssl_version = ssl_undefined_void_function,
@@ -447,6 +456,7 @@ static const SSL_METHOD_INTERNAL TLSv1_method_internal_data = {
 	.ssl_free = tls1_free,
 	.ssl_accept = ssl3_accept,
 	.ssl_connect = ssl3_connect,
+	.ssl_shutdown = ssl3_shutdown,
 	.get_ssl_method = tls1_get_method,
 	.get_timeout = tls1_default_timeout,
 	.ssl_version = ssl_undefined_void_function,
@@ -476,6 +486,7 @@ static const SSL_METHOD_INTERNAL TLSv1_1_method_internal_data = {
 	.ssl_free = tls1_free,
 	.ssl_accept = ssl3_accept,
 	.ssl_connect = ssl3_connect,
+	.ssl_shutdown = ssl3_shutdown,
 	.get_ssl_method = tls1_get_method,
 	.get_timeout = tls1_default_timeout,
 	.ssl_version = ssl_undefined_void_function,
@@ -505,6 +516,7 @@ static const SSL_METHOD_INTERNAL TLSv1_2_method_internal_data = {
 	.ssl_free = tls1_free,
 	.ssl_accept = ssl3_accept,
 	.ssl_connect = ssl3_connect,
+	.ssl_shutdown = ssl3_shutdown,
 	.get_ssl_method = tls1_get_method,
 	.get_timeout = tls1_default_timeout,
 	.ssl_version = ssl_undefined_void_function,
@@ -576,6 +588,7 @@ static const SSL_METHOD_INTERNAL TLS_server_method_internal_data = {
 	.ssl_free = tls1_free,
 	.ssl_accept = ssl3_accept,
 	.ssl_connect = ssl_undefined_function,
+	.ssl_shutdown = ssl3_shutdown,
 	.get_ssl_method = tls1_get_server_method,
 	.get_timeout = tls1_default_timeout,
 	.ssl_version = ssl_undefined_void_function,
@@ -605,6 +618,7 @@ static const SSL_METHOD_INTERNAL TLSv1_server_method_internal_data = {
 	.ssl_free = tls1_free,
 	.ssl_accept = ssl3_accept,
 	.ssl_connect = ssl_undefined_function,
+	.ssl_shutdown = ssl3_shutdown,
 	.get_ssl_method = tls1_get_server_method,
 	.get_timeout = tls1_default_timeout,
 	.ssl_version = ssl_undefined_void_function,
@@ -634,6 +648,7 @@ 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_shutdown = ssl3_shutdown,
 	.get_ssl_method = tls1_get_server_method,
 	.get_timeout = tls1_default_timeout,
 	.ssl_version = ssl_undefined_void_function,
@@ -663,6 +678,7 @@ 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_shutdown = ssl3_shutdown,
 	.get_ssl_method = tls1_get_server_method,
 	.get_timeout = tls1_default_timeout,
 	.ssl_version = ssl_undefined_void_function,
-- 
cgit v1.2.3-55-g6feb