From 759dd02e3ff981ea9d2869cfe079c8f201eba19d Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sun, 8 Oct 2017 16:24:02 +0000
Subject: Convert ssl3_send_change_cipher_spec() to use CBB and make it handle
 DTLS, which allows us to drop dtls1_send_change_cipher_spec() entirely.

ok inoguchi@
---
 src/lib/libssl/s3_lib.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

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

diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index a05116cb8f..89af1ef3bf 100644
--- a/src/lib/libssl/s3_lib.c
+++ b/src/lib/libssl/s3_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_lib.c,v 1.161 2017/09/25 18:04:08 jsing Exp $ */
+/* $OpenBSD: s3_lib.c,v 1.162 2017/10/08 16:24:02 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -1552,11 +1552,17 @@ ssl3_handshake_msg_finish_cbb(SSL *s, CBB *handshake)
 
 int
 ssl3_handshake_write(SSL *s)
+{
+	return ssl3_record_write(s, SSL3_RT_HANDSHAKE);
+}
+
+int
+ssl3_record_write(SSL *s, int type)
 {
 	if (SSL_IS_DTLS(s))
-		return dtls1_do_write(s, SSL3_RT_HANDSHAKE);
+		return dtls1_do_write(s, type);
 
-	return ssl3_do_write(s, SSL3_RT_HANDSHAKE);
+	return ssl3_do_write(s, type);
 }
 
 int
-- 
cgit v1.2.3-55-g6feb