diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-06-01 06:58:25 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-06-07 11:31:15 +1000 |
commit | cc812baf39b93d5355565da98648d8c31f955990 (patch) | |
tree | 58f8ea1dc3f37e67a1741cab8a5514f334ad782e /sshbuf.c | |
parent | 65eb8fae0d7ba45ef4483a3cf0ae7fd0dbc7c226 (diff) |
upstream commit
unconditionally zero init size of buffer; ok markus@
deraadt@
Upstream-ID: 218963e846d8f26763ba25afe79294547b99da29
Diffstat (limited to 'sshbuf.c')
-rw-r--r-- | sshbuf.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshbuf.c,v 1.10 2017/05/31 09:15:42 deraadt Exp $ */ | 1 | /* $OpenBSD: sshbuf.c,v 1.11 2017/06/01 06:58:25 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2011 Damien Miller | 3 | * Copyright (c) 2011 Damien Miller |
4 | * | 4 | * |
@@ -201,8 +201,8 @@ sshbuf_reset(struct sshbuf *buf) | |||
201 | buf->cd = buf->d = d; | 201 | buf->cd = buf->d = d; |
202 | buf->alloc = SSHBUF_SIZE_INIT; | 202 | buf->alloc = SSHBUF_SIZE_INIT; |
203 | } | 203 | } |
204 | } else | 204 | } |
205 | explicit_bzero(buf->d, SSHBUF_SIZE_INIT); | 205 | explicit_bzero(buf->d, SSHBUF_SIZE_INIT); |
206 | } | 206 | } |
207 | 207 | ||
208 | size_t | 208 | size_t |