summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2020-03-13 15:54:34 +0000
committerjsing <>2020-03-13 15:54:34 +0000
commitc809ac6677ff2c1852850a8ba62bf7c05d60d040 (patch)
treeb1600c8f66be418d1f7c7a6bde0a279cdbc42d40
parent175ca43e2c7b1e7714399153118edc54b4268792 (diff)
downloadopenbsd-c809ac6677ff2c1852850a8ba62bf7c05d60d040.tar.gz
openbsd-c809ac6677ff2c1852850a8ba62bf7c05d60d040.tar.bz2
openbsd-c809ac6677ff2c1852850a8ba62bf7c05d60d040.zip
Ensure that CBB_add_space() always provides zeroed memory.
ok tb@
-rw-r--r--src/lib/libssl/bs_cbb.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/libssl/bs_cbb.c b/src/lib/libssl/bs_cbb.c
index 16e17fb70f..d11da853cd 100644
--- a/src/lib/libssl/bs_cbb.c
+++ b/src/lib/libssl/bs_cbb.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: bs_cbb.c,v 1.21 2020/03/12 17:17:12 jsing Exp $ */ 1/* $OpenBSD: bs_cbb.c,v 1.22 2020/03/13 15:54:34 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014, Google Inc. 3 * Copyright (c) 2014, Google Inc.
4 * 4 *
@@ -374,6 +374,7 @@ CBB_add_space(CBB *cbb, uint8_t **out_data, size_t len)
374 if (!CBB_flush(cbb) || !cbb_buffer_add(cbb->base, out_data, len)) 374 if (!CBB_flush(cbb) || !cbb_buffer_add(cbb->base, out_data, len))
375 return 0; 375 return 0;
376 376
377 memset(*out_data, 0, len);
377 return 1; 378 return 1;
378} 379}
379 380