From 9366f4ef0d67a19fe5eca3feedbc756a4a8966b2 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Thu, 26 Jan 2017 05:31:25 +0000
Subject: Merge the client/server version negotiation into the existing
 (currently fixed version) client/server code.

ok beck@
---
 src/lib/libssl/d1_clnt.c | 5 ++---
 1 file changed, 2 insertions(+), 3 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 6b5510c1e3..5f8b56ebed 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.69 2017/01/23 13:36:13 jsing Exp $ */
+/* $OpenBSD: d1_clnt.c,v 1.70 2017/01/26 05:31:25 jsing Exp $ */
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -127,7 +127,6 @@
 
 #include "bytestring.h"
 
-static const SSL_METHOD *dtls1_get_client_method(int ver);
 static int dtls1_get_hello_verify(SSL *s);
 
 static const SSL_METHOD_INTERNAL DTLSv1_client_method_internal_data = {
@@ -170,7 +169,7 @@ DTLSv1_client_method(void)
 	return &DTLSv1_client_method_data;
 }
 
-static const SSL_METHOD *
+const SSL_METHOD *
 dtls1_get_client_method(int ver)
 {
 	if (ver == DTLS1_VERSION)
-- 
cgit v1.2.3-55-g6feb