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/ssl_locl.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/lib/libssl/ssl_locl.h')

diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index 2fec36fba9..eed0803a85 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.194 2017/10/08 16:24:02 jsing Exp $ */
+/* $OpenBSD: ssl_locl.h,v 1.195 2017/10/10 15:13:26 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1199,6 +1199,7 @@ void dtls1_double_timeout(SSL *s);
 unsigned int dtls1_min_mtu(void);
 
 /* some client-only functions */
+int dtls1_get_hello_verify(SSL *s);
 int ssl3_client_hello(SSL *s);
 int ssl3_get_server_hello(SSL *s);
 int ssl3_get_certificate_request(SSL *s);
@@ -1236,7 +1237,6 @@ void tls1_clear(SSL *s);
 
 int dtls1_new(SSL *s);
 int dtls1_accept(SSL *s);
-int dtls1_connect(SSL *s);
 void dtls1_free(SSL *s);
 void dtls1_clear(SSL *s);
 long dtls1_ctrl(SSL *s, int cmd, long larg, void *parg);
-- 
cgit v1.2.3-55-g6feb