summaryrefslogtreecommitdiff
path: root/sbin/iked
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2014-05-06 11:11:15 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2014-05-06 11:11:15 +0000
commitae89337bd95668465fe8cd13876480a5184df039 (patch)
tree483601035cff237ab14aac09a3c53a57a7afa389 /sbin/iked
parent24f590c3387aff818886ba1455fbdc744ebdd756 (diff)
Explicitly zero out the ibufs before releasing the memory to make sure
that included crypto parameters are cleaned. ok mikeb@ markus@
Diffstat (limited to 'sbin/iked')
-rw-r--r--sbin/iked/imsg_util.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/sbin/iked/imsg_util.c b/sbin/iked/imsg_util.c
index ef86d3c8658..f88321757b2 100644
--- a/sbin/iked/imsg_util.c
+++ b/sbin/iked/imsg_util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: imsg_util.c,v 1.8 2013/10/24 02:55:50 deraadt Exp $ */
+/* $OpenBSD: imsg_util.c,v 1.9 2014/05/06 11:11:14 reyk Exp $ */
/*
* Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org>
@@ -45,7 +45,7 @@ ibuf_cat(struct ibuf *dst, struct ibuf *src)
void
ibuf_zero(struct ibuf *buf)
{
- memset(buf->buf, 0, buf->wpos);
+ explicit_bzero(buf->buf, buf->wpos);
}
struct ibuf *
@@ -103,8 +103,10 @@ ibuf_release(struct ibuf *buf)
{
if (buf == NULL)
return;
- if (buf->buf != NULL)
+ if (buf->buf != NULL) {
+ ibuf_zero(buf);
free(buf->buf);
+ }
free(buf);
}