From 4ca92876cd1aa45f9ac5ea123afc11e1ef4574cb Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Fri, 24 Aug 2018 17:30:32 +0000
Subject: Clean up handshake message start/finish functions.

Now that all handshake messages are created using CBB, remove the non-CBB
ssl3_handshake_msg_start()/ssl3_handshake_msg_finish() functions. Rename
the CBB variants by dropping the _cbb suffix.

ok bcook@ inoguchi@ tb@
---
 src/lib/libssl/d1_srvr.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/src/lib/libssl/d1_srvr.c b/src/lib/libssl/d1_srvr.c
index 3de0a72f27..4217519783 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.92 2018/04/07 17:02:34 jsing Exp $ */
+/* $OpenBSD: d1_srvr.c,v 1.93 2018/08/24 17:30:32 jsing Exp $ */
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -185,7 +185,7 @@ dtls1_send_hello_verify_request(SSL *s)
 			return 0;
 		}
 
-		if (!ssl3_handshake_msg_start_cbb(s, &cbb, &verify,
+		if (!ssl3_handshake_msg_start(s, &cbb, &verify,
 		    DTLS1_MT_HELLO_VERIFY_REQUEST))
 			goto err;
 		if (!CBB_add_u16(&verify, s->version))
@@ -194,7 +194,7 @@ dtls1_send_hello_verify_request(SSL *s)
 			goto err;
 		if (!CBB_add_bytes(&cookie, D1I(s)->cookie, D1I(s)->cookie_len))
 			goto err;
-		if (!ssl3_handshake_msg_finish_cbb(s, &cbb))
+		if (!ssl3_handshake_msg_finish(s, &cbb))
 			goto err;
 
 		S3I(s)->hs.state = DTLS1_ST_SW_HELLO_VERIFY_REQUEST_B;
-- 
cgit v1.2.3-55-g6feb