From cc812baf39b93d5355565da98648d8c31f955990 Mon Sep 17 00:00:00 2001 From: "djm@openbsd.org" Date: Thu, 1 Jun 2017 06:58:25 +0000 Subject: [PATCH] upstream commit unconditionally zero init size of buffer; ok markus@ deraadt@ Upstream-ID: 218963e846d8f26763ba25afe79294547b99da29 --- sshbuf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sshbuf.c b/sshbuf.c index b7a90b5c2..de783a363 100644 --- a/sshbuf.c +++ b/sshbuf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshbuf.c,v 1.10 2017/05/31 09:15:42 deraadt Exp $ */ +/* $OpenBSD: sshbuf.c,v 1.11 2017/06/01 06:58:25 djm Exp $ */ /* * Copyright (c) 2011 Damien Miller * @@ -201,8 +201,8 @@ sshbuf_reset(struct sshbuf *buf) buf->cd = buf->d = d; buf->alloc = SSHBUF_SIZE_INIT; } - } else - explicit_bzero(buf->d, SSHBUF_SIZE_INIT); + } + explicit_bzero(buf->d, SSHBUF_SIZE_INIT); } size_t