From 50b0edb9d3ae72d9c4ace7aa8779e76a2b64068f Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Tue, 10 Oct 2017 15:13:26 +0000
Subject: Merge dtls1_connect() into ssl3_connect(), removing a large amount of
 duplicated code. For now this is essentially adds a diff of the two functions
 with 'if (SSL_IS_DTLS(s))' - further clean up and improvement will follow.

ok inoguchi@
---
 src/lib/libssl/d1_meth.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/src/lib/libssl/d1_meth.c b/src/lib/libssl/d1_meth.c
index fcd8906c45..e513c4a9be 100644
--- a/src/lib/libssl/d1_meth.c
+++ b/src/lib/libssl/d1_meth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_meth.c,v 1.13 2017/01/23 13:36:13 jsing Exp $ */
+/* $OpenBSD: d1_meth.c,v 1.14 2017/10/10 15:13:26 jsing Exp $ */
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -73,7 +73,7 @@ static const SSL_METHOD_INTERNAL DTLSv1_method_internal_data = {
 	.ssl_clear = dtls1_clear,
 	.ssl_free = dtls1_free,
 	.ssl_accept = dtls1_accept,
-	.ssl_connect = dtls1_connect,
+	.ssl_connect = ssl3_connect,
 	.ssl_read = ssl3_read,
 	.ssl_peek = ssl3_peek,
 	.ssl_write = ssl3_write,
-- 
cgit v1.2.3-55-g6feb