summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorRenato Westphal <renato@cvs.openbsd.org>2016-05-23 15:01:55 +0000
committerRenato Westphal <renato@cvs.openbsd.org>2016-05-23 15:01:55 +0000
commit49a2b6194c33c539c5ed6fae22bbe46b32c854bb (patch)
treefced944bd5023fcefe97a3d77c2cc97e66fb5c70 /usr.sbin
parentb29c91d520f9854061ca57a248145d6adebc4cc5 (diff)
Pull explicit_bzero patch from bgpd.
Original author: Michael McConville.
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/ldpd/pfkey.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/ldpd/pfkey.c b/usr.sbin/ldpd/pfkey.c
index 0a846905ed2..766eb5ab547 100644
--- a/usr.sbin/ldpd/pfkey.c
+++ b/usr.sbin/ldpd/pfkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pfkey.c,v 1.1 2015/07/19 21:01:56 renato Exp $ */
+/* $OpenBSD: pfkey.c,v 1.2 2016/05/23 15:01:54 renato Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -310,14 +310,14 @@ pfkey_reply(int sd, u_int32_t *spip)
len = hdr.sadb_msg_len * PFKEY2_CHUNK;
if (read(sd, data, len) != len) {
log_warn("pfkey read");
- bzero(data, len);
+ explicit_bzero(data, len);
free(data);
return (-1);
}
if (hdr.sadb_msg_type == SADB_GETSPI) {
if (spip == NULL) {
- bzero(data, len);
+ explicit_bzero(data, len);
free(data);
return (0);
}
@@ -335,7 +335,7 @@ pfkey_reply(int sd, u_int32_t *spip)
}
}
}
- bzero(data, len);
+ explicit_bzero(data, len);
free(data);
return (0);
}