From e64dc34242390cd4a16eb683e606c5beccbb9aa7 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Wed, 11 Oct 2017 16:51:39 +0000
Subject: Fully convert ssl3_send_server_hello() to CBB.

Based on a diff from doug@
---
 src/lib/libssl/t1_lib.c | 25 +------------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

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

diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c
index 0d03b45a97..8526ca167b 100644
--- a/src/lib/libssl/t1_lib.c
+++ b/src/lib/libssl/t1_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t1_lib.c,v 1.137 2017/08/30 16:44:37 jsing Exp $ */
+/* $OpenBSD: t1_lib.c,v 1.138 2017/10/11 16:51:39 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -684,29 +684,6 @@ ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned char *limit)
 	return (p + len);
 }
 
-unsigned char *
-ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned char *limit)
-{
-	size_t len;
-	CBB cbb;
-
-	if (p >= limit)
-		return NULL;
-
-	if (!CBB_init_fixed(&cbb, p, limit - p))
-		return NULL;
-	if (!tlsext_serverhello_build(s, &cbb)) {
-		CBB_cleanup(&cbb);
-		return NULL;
-	}
-	if (!CBB_finish(&cbb, NULL, &len)) {
-		CBB_cleanup(&cbb);
-		return NULL;
-	}
-
-	return (p + len);
-}
-
 int
 ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d,
     int n, int *al)
-- 
cgit v1.2.3-55-g6feb