From 13d586194b455eb52b94d1b5b2e3e174d59833a5 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sat, 12 Sep 2015 13:09:07 +0000
Subject: Uncopy and unpaste dtls1_send_hello_request().

---
 src/lib/libssl/d1_srvr.c          | 18 ++----------------
 src/lib/libssl/src/ssl/d1_srvr.c  | 18 ++----------------
 src/lib/libssl/src/ssl/ssl_locl.h |  3 +--
 src/lib/libssl/ssl_locl.h         |  3 +--
 4 files changed, 6 insertions(+), 36 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libssl/d1_srvr.c b/src/lib/libssl/d1_srvr.c
index c0489adfa4..ab5c3fcb2c 100644
--- a/src/lib/libssl/d1_srvr.c
+++ b/src/lib/libssl/d1_srvr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_srvr.c,v 1.58 2015/09/11 18:08:21 jsing Exp $ */
+/* $OpenBSD: d1_srvr.c,v 1.59 2015/09/12 13:09:07 jsing Exp $ */
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -271,7 +271,7 @@ dtls1_accept(SSL *s)
 			s->shutdown = 0;
 			dtls1_clear_record_buffer(s);
 			dtls1_start_timer(s);
-			ret = dtls1_send_hello_request(s);
+			ret = ssl3_send_hello_request(s);
 			if (ret <= 0)
 				goto end;
 			s->s3->tmp.next_state = SSL3_ST_SR_CLNT_HELLO_A;
@@ -666,20 +666,6 @@ end:
 	return (ret);
 }
 
-int
-dtls1_send_hello_request(SSL *s)
-{
-	if (s->state == SSL3_ST_SW_HELLO_REQ_A) {
-		ssl3_handshake_msg_start(s, SSL3_MT_HELLO_REQUEST);
-		ssl3_handshake_msg_finish(s, 0);
-
-		s->state = SSL3_ST_SW_HELLO_REQ_B;
-	}
-
-	/* SSL3_ST_SW_HELLO_REQ_B */
-	return (ssl3_handshake_write(s));
-}
-
 int
 dtls1_send_hello_verify_request(SSL *s)
 {
diff --git a/src/lib/libssl/src/ssl/d1_srvr.c b/src/lib/libssl/src/ssl/d1_srvr.c
index c0489adfa4..ab5c3fcb2c 100644
--- a/src/lib/libssl/src/ssl/d1_srvr.c
+++ b/src/lib/libssl/src/ssl/d1_srvr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_srvr.c,v 1.58 2015/09/11 18:08:21 jsing Exp $ */
+/* $OpenBSD: d1_srvr.c,v 1.59 2015/09/12 13:09:07 jsing Exp $ */
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -271,7 +271,7 @@ dtls1_accept(SSL *s)
 			s->shutdown = 0;
 			dtls1_clear_record_buffer(s);
 			dtls1_start_timer(s);
-			ret = dtls1_send_hello_request(s);
+			ret = ssl3_send_hello_request(s);
 			if (ret <= 0)
 				goto end;
 			s->s3->tmp.next_state = SSL3_ST_SR_CLNT_HELLO_A;
@@ -666,20 +666,6 @@ end:
 	return (ret);
 }
 
-int
-dtls1_send_hello_request(SSL *s)
-{
-	if (s->state == SSL3_ST_SW_HELLO_REQ_A) {
-		ssl3_handshake_msg_start(s, SSL3_MT_HELLO_REQUEST);
-		ssl3_handshake_msg_finish(s, 0);
-
-		s->state = SSL3_ST_SW_HELLO_REQ_B;
-	}
-
-	/* SSL3_ST_SW_HELLO_REQ_B */
-	return (ssl3_handshake_write(s));
-}
-
 int
 dtls1_send_hello_verify_request(SSL *s)
 {
diff --git a/src/lib/libssl/src/ssl/ssl_locl.h b/src/lib/libssl/src/ssl/ssl_locl.h
index 48ac8c8b2d..e817620d8b 100644
--- a/src/lib/libssl/src/ssl/ssl_locl.h
+++ b/src/lib/libssl/src/ssl/ssl_locl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_locl.h,v 1.121 2015/09/12 12:58:15 jsing Exp $ */
+/* $OpenBSD: ssl_locl.h,v 1.122 2015/09/12 13:09:07 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -724,7 +724,6 @@ int ssl3_get_client_key_exchange(SSL *s);
 int ssl3_get_cert_verify(SSL *s);
 int ssl3_get_next_proto(SSL *s);
 
-int dtls1_send_hello_request(SSL *s);
 int dtls1_send_server_hello(SSL *s);
 int dtls1_send_server_certificate(SSL *s);
 int dtls1_send_server_key_exchange(SSL *s);
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index 48ac8c8b2d..e817620d8b 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.121 2015/09/12 12:58:15 jsing Exp $ */
+/* $OpenBSD: ssl_locl.h,v 1.122 2015/09/12 13:09:07 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -724,7 +724,6 @@ int ssl3_get_client_key_exchange(SSL *s);
 int ssl3_get_cert_verify(SSL *s);
 int ssl3_get_next_proto(SSL *s);
 
-int dtls1_send_hello_request(SSL *s);
 int dtls1_send_server_hello(SSL *s);
 int dtls1_send_server_certificate(SSL *s);
 int dtls1_send_server_key_exchange(SSL *s);
-- 
cgit v1.2.3-55-g6feb