From a0afc1b4032278e02db285a67fa2e295e9970176 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Thu, 1 Jul 2021 17:53:39 +0000
Subject: Merge SSL_METHOD_INTERNAL into SSL_METHOD.

Now that SSL_METHOD is opaque and in internal headers, we can remove
SSL_METHOD_INTERNAL by merging it back into SSL_METHOD.

ok tb@
---
 src/lib/libssl/bio_ssl.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/src/lib/libssl/bio_ssl.c b/src/lib/libssl/bio_ssl.c
index 460b09fd87..bb40b2a6f7 100644
--- a/src/lib/libssl/bio_ssl.c
+++ b/src/lib/libssl/bio_ssl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bio_ssl.c,v 1.30 2021/06/11 11:13:53 jsing Exp $ */
+/* $OpenBSD: bio_ssl.c,v 1.31 2021/07/01 17:53:39 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -294,10 +294,10 @@ ssl_ctrl(BIO *b, int cmd, long num, void *ptr)
 		SSL_shutdown(ssl);
 
 		if (ssl->internal->handshake_func ==
-		    ssl->method->internal->ssl_connect)
+		    ssl->method->ssl_connect)
 			SSL_set_connect_state(ssl);
 		else if (ssl->internal->handshake_func ==
-		    ssl->method->internal->ssl_accept)
+		    ssl->method->ssl_accept)
 			SSL_set_accept_state(ssl);
 
 		SSL_clear(ssl);
-- 
cgit v1.2.3-55-g6feb