From 26c614f4084ccdc122fba9ad8ad8b8aef5c7edb7 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Thu, 7 Jul 2022 17:16:05 +0000
Subject: Sync bs_cbb.c with libssl.

ok jsing
---
 src/lib/libcrypto/bytestring/bs_cbb.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/lib/libcrypto/bytestring/bs_cbb.c b/src/lib/libcrypto/bytestring/bs_cbb.c
index 130093117b..c8b6f48245 100644
--- a/src/lib/libcrypto/bytestring/bs_cbb.c
+++ b/src/lib/libcrypto/bytestring/bs_cbb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bs_cbb.c,v 1.3 2022/01/06 14:32:55 jsing Exp $	*/
+/*	$OpenBSD: bs_cbb.c,v 1.4 2022/07/07 17:16:05 tb Exp $	*/
 /*
  * Copyright (c) 2014, Google Inc.
  *
@@ -163,6 +163,9 @@ CBB_finish(CBB *cbb, uint8_t **out_data, size_t *out_len)
 		 */
 		return 0;
 
+	if (out_data != NULL && *out_data != NULL)
+		return 0;
+
 	if (out_data != NULL)
 		*out_data = cbb->base->buf;
 
-- 
cgit v1.2.3-55-g6feb