From 034e1f9018bedb7d71df3286551c19fa5bd18c07 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Mon, 23 Jan 2017 10:22:06 +0000
Subject: Remove ssl_ctrl, ssl_ctx_ctrl, ssl_callback_ctrl and
 ssl_ctx_callback_ctrl from SSL_METHOD, replacing usage with direct calls to
 the appropriate functions.

ok beck@
---
 src/lib/libssl/d1_clnt.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

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

diff --git a/src/lib/libssl/d1_clnt.c b/src/lib/libssl/d1_clnt.c
index 9319794a66..503a1f7fc6 100644
--- a/src/lib/libssl/d1_clnt.c
+++ b/src/lib/libssl/d1_clnt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_clnt.c,v 1.67 2017/01/23 08:48:44 beck Exp $ */
+/* $OpenBSD: d1_clnt.c,v 1.68 2017/01/23 10:22:06 jsing Exp $ */
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -149,8 +149,6 @@ static const SSL_METHOD DTLSv1_client_method_data = {
 	.ssl_read_bytes = dtls1_read_bytes,
 	.ssl_write_bytes = dtls1_write_app_data_bytes,
 	.ssl_dispatch_alert = dtls1_dispatch_alert,
-	.ssl_ctrl = dtls1_ctrl,
-	.ssl_ctx_ctrl = ssl3_ctx_ctrl,
 	.get_cipher_by_char = ssl3_get_cipher_by_char,
 	.put_cipher_by_char = ssl3_put_cipher_by_char,
 	.ssl_pending = ssl3_pending,
@@ -160,8 +158,6 @@ static const SSL_METHOD DTLSv1_client_method_data = {
 	.get_timeout = dtls1_default_timeout,
 	.ssl3_enc = &DTLSv1_enc_data,
 	.ssl_version = ssl_undefined_void_function,
-	.ssl_callback_ctrl = ssl3_callback_ctrl,
-	.ssl_ctx_callback_ctrl = ssl3_ctx_callback_ctrl,
 };
 
 const SSL_METHOD *
-- 
cgit v1.2.3-55-g6feb