summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorderaadt <deraadt@openbsd.org>2011-01-12 17:01:26 +0000
committerderaadt <deraadt@openbsd.org>2011-01-12 17:01:26 +0000
commit9415c9fc0967db4aedd98f35620f7fae7adb6ad5 (patch)
tree2df34a74964c1523ec3f3479ee10191ec0b3da33
parentcleanup aes-ctr keystream after use; ok deraadt (diff)
downloadwireguard-openbsd-9415c9fc0967db4aedd98f35620f7fae7adb6ad5.tar.xz
wireguard-openbsd-9415c9fc0967db4aedd98f35620f7fae7adb6ad5.zip
explicit_bzero() of key material in drivers few people use
-rw-r--r--sys/dev/pci/lofn.c6
-rw-r--r--sys/dev/pci/noct.c6
-rw-r--r--sys/dev/pci/nofn.c6
3 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/pci/lofn.c b/sys/dev/pci/lofn.c
index 4431b6fe415..212c79316dd 100644
--- a/sys/dev/pci/lofn.c
+++ b/sys/dev/pci/lofn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lofn.c,v 1.28 2010/04/08 00:23:53 tedu Exp $ */
+/* $OpenBSD: lofn.c,v 1.29 2011/01/12 17:01:26 deraadt Exp $ */
/*
* Copyright (c) 2001-2002 Jason L. Wright (jason@thought.net)
@@ -447,7 +447,7 @@ lofn_modexp_start(sc, q)
return (0);
errout:
- bzero(&sc->sc_tmp, sizeof(sc->sc_tmp));
+ explicit_bzero(&sc->sc_tmp, sizeof(sc->sc_tmp));
lofn_zero_reg(sc, 0);
lofn_zero_reg(sc, 1);
lofn_zero_reg(sc, 2);
@@ -480,7 +480,7 @@ lofn_modexp_finish(sc, q)
bzero(krp->krp_param[krp->krp_iparams].crp_p + reglen,
crplen - reglen);
}
- bzero(&sc->sc_tmp, sizeof(sc->sc_tmp));
+ explicit_bzero(&sc->sc_tmp, sizeof(sc->sc_tmp));
lofn_zero_reg(sc, 0);
lofn_zero_reg(sc, 1);
lofn_zero_reg(sc, 2);
diff --git a/sys/dev/pci/noct.c b/sys/dev/pci/noct.c
index 5556424a55b..44c124f6b1a 100644
--- a/sys/dev/pci/noct.c
+++ b/sys/dev/pci/noct.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: noct.c,v 1.21 2010/07/02 02:40:16 blambert Exp $ */
+/* $OpenBSD: noct.c,v 1.22 2011/01/12 17:01:26 deraadt Exp $ */
/*
* Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -1729,7 +1729,7 @@ noct_kload_cb(sc, wp, err)
struct noct_bnc_sw *sw = &sc->sc_pkh_bnsw[wp];
extent_free(sc->sc_pkh_bn, sw->bn_off, sw->bn_siz, EX_NOWAIT);
- bzero(&sc->sc_bncache[sw->bn_off * 16], sw->bn_siz * 16);
+ explicit_bzero(&sc->sc_bncache[sw->bn_off * 16], sw->bn_siz * 16);
}
void
@@ -1753,7 +1753,7 @@ noct_modmul_cb(sc, wp, err)
out:
extent_free(sc->sc_pkh_bn, sw->bn_off, sw->bn_siz, EX_NOWAIT);
- bzero(&sc->sc_bncache[sw->bn_off * 16], sw->bn_siz * 16);
+ explicit_bzero(&sc->sc_bncache[sw->bn_off * 16], sw->bn_siz * 16);
krp->krp_status = err;
crypto_kdone(krp);
}
diff --git a/sys/dev/pci/nofn.c b/sys/dev/pci/nofn.c
index e8b21a6aba4..1ca24142fab 100644
--- a/sys/dev/pci/nofn.c
+++ b/sys/dev/pci/nofn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nofn.c,v 1.17 2010/04/06 22:28:07 tedu Exp $ */
+/* $OpenBSD: nofn.c,v 1.18 2011/01/12 17:01:26 deraadt Exp $ */
/*
* Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -637,7 +637,7 @@ nofn_modexp_start(sc, q)
return (0);
errout:
- bzero(&sc->sc_pk_tmp, sizeof(sc->sc_pk_tmp));
+ explicit_bzero(&sc->sc_pk_tmp, sizeof(sc->sc_pk_tmp));
nofn_pk_zero_reg(sc, 0);
nofn_pk_zero_reg(sc, 1);
nofn_pk_zero_reg(sc, 2);
@@ -670,7 +670,7 @@ nofn_modexp_finish(sc, q)
bzero(krp->krp_param[krp->krp_iparams].crp_p + reglen,
crplen - reglen);
}
- bzero(&sc->sc_pk_tmp, sizeof(sc->sc_pk_tmp));
+ explicit_bzero(&sc->sc_pk_tmp, sizeof(sc->sc_pk_tmp));
nofn_pk_zero_reg(sc, 0);
nofn_pk_zero_reg(sc, 1);
nofn_pk_zero_reg(sc, 2);