summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/bytestring/bs_cbb.c
diff options
context:
space:
mode:
authortb <>2022-07-07 17:16:05 +0000
committertb <>2022-07-07 17:16:05 +0000
commit26c614f4084ccdc122fba9ad8ad8b8aef5c7edb7 (patch)
tree0f6effd89fe86729d3ad3a267341f37899da545a /src/lib/libcrypto/bytestring/bs_cbb.c
parentb7b2f8cb86a1e146a8703597848c9787d85dcbbe (diff)
downloadopenbsd-26c614f4084ccdc122fba9ad8ad8b8aef5c7edb7.tar.gz
openbsd-26c614f4084ccdc122fba9ad8ad8b8aef5c7edb7.tar.bz2
openbsd-26c614f4084ccdc122fba9ad8ad8b8aef5c7edb7.zip
Sync bs_cbb.c with libssl.
ok jsing
Diffstat (limited to 'src/lib/libcrypto/bytestring/bs_cbb.c')
-rw-r--r--src/lib/libcrypto/bytestring/bs_cbb.c5
1 files changed, 4 insertions, 1 deletions
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 @@
1/* $OpenBSD: bs_cbb.c,v 1.3 2022/01/06 14:32:55 jsing Exp $ */ 1/* $OpenBSD: bs_cbb.c,v 1.4 2022/07/07 17:16:05 tb Exp $ */
2/* 2/*
3 * Copyright (c) 2014, Google Inc. 3 * Copyright (c) 2014, Google Inc.
4 * 4 *
@@ -163,6 +163,9 @@ CBB_finish(CBB *cbb, uint8_t **out_data, size_t *out_len)
163 */ 163 */
164 return 0; 164 return 0;
165 165
166 if (out_data != NULL && *out_data != NULL)
167 return 0;
168
166 if (out_data != NULL) 169 if (out_data != NULL)
167 *out_data = cbb->base->buf; 170 *out_data = cbb->base->buf;
168 171