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@

3 files changed, 21 insertions, 4 deletions

diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index 32c1aef017..374342c311 100644
--- a/src/lib/libssl/ssl_lib.c
+++ b/src/lib/libssl/ssl_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_lib.c,v 1.206 2019/11/04 19:17:28 otto Exp $ */
+/* $OpenBSD: ssl_lib.c,v 1.207 2019/11/17 19:07:07 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1012,7 +1012,7 @@ SSL_shutdown(SSL *s)
         }
 
         if (s != NULL && !SSL_in_init(s))
-                return (ssl3_shutdown(s));
+                return (s->method->internal->ssl_shutdown(s));
 
         return (1);
 }
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index c3c762a5fa..f9c75f8a7f 100644
--- a/src/lib/libssl/ssl_locl.h
+++ b/src/lib/libssl/ssl_locl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_locl.h,v 1.247 2019/04/22 15:12:20 jsing Exp $ */
+/* $OpenBSD: ssl_locl.h,v 1.248 2019/11/17 19:07:07 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -376,6 +376,7 @@ typedef struct ssl_method_internal_st {
 
         int (*ssl_accept)(SSL *s);
         int (*ssl_connect)(SSL *s);
+        int (*ssl_shutdown)(SSL *s);
 
         int (*ssl_renegotiate)(SSL *s);
         int (*ssl_renegotiate_check)(SSL *s);
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,