artulab
projects
/
openbsd
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8ba2322
)
Sync bs_cbb.c with libssl.
author
tb
<tb@openbsd.org>
Thu, 7 Jul 2022 17:16:05 +0000
(17:16 +0000)
committer
tb
<tb@openbsd.org>
Thu, 7 Jul 2022 17:16:05 +0000
(17:16 +0000)
ok jsing
lib/libcrypto/bytestring/bs_cbb.c
patch
|
blob
|
history
diff --git
a/lib/libcrypto/bytestring/bs_cbb.c
b/lib/libcrypto/bytestring/bs_cbb.c
index
1300931
..
c8b6f48
100644
(file)
--- a/
lib/libcrypto/bytestring/bs_cbb.c
+++ b/
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;