summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/amd64/amd64/aesni.c4
-rw-r--r--sys/arch/amd64/amd64/via.c6
-rw-r--r--sys/arch/i386/i386/via.c6
-rw-r--r--sys/arch/i386/pci/glxsb.c6
4 files changed, 11 insertions, 11 deletions
diff --git a/sys/arch/amd64/amd64/aesni.c b/sys/arch/amd64/amd64/aesni.c
index afb6e593fd3..cfcca531ee2 100644
--- a/sys/arch/amd64/amd64/aesni.c
+++ b/sys/arch/amd64/amd64/aesni.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aesni.c,v 1.18 2011/01/11 15:42:05 deraadt Exp $ */
+/* $OpenBSD: aesni.c,v 1.19 2011/01/12 17:15:23 deraadt Exp $ */
/*-
* Copyright (c) 2003 Jason Wright
* Copyright (c) 2003, 2004 Theo de Raadt
@@ -275,7 +275,7 @@ aesni_freesession(u_int64_t tid)
free(swd, M_CRYPTO_DATA);
}
- bzero(ses, sizeof (*ses));
+ explicit_bzero(ses, sizeof (*ses));
pool_put(&aesnipl, ses);
return (0);
diff --git a/sys/arch/amd64/amd64/via.c b/sys/arch/amd64/amd64/via.c
index 45a245b18b8..c34b9f34d3c 100644
--- a/sys/arch/amd64/amd64/via.c
+++ b/sys/arch/amd64/amd64/via.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: via.c,v 1.9 2011/01/11 15:42:05 deraadt Exp $ */
+/* $OpenBSD: via.c,v 1.10 2011/01/12 17:15:23 deraadt Exp $ */
/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */
/*-
@@ -162,7 +162,7 @@ viac3_crypto_newsession(u_int32_t *sidp, struct cryptoini *cri)
if (ses == NULL)
return (ENOMEM);
bcopy(sc->sc_sessions, ses, sesn * sizeof(*ses));
- bzero(sc->sc_sessions, sesn * sizeof(*ses));
+ explicit_bzero(sc->sc_sessions, sesn * sizeof(*ses));
free(sc->sc_sessions, M_DEVBUF);
sc->sc_sessions = ses;
ses = &sc->sc_sessions[sesn];
@@ -312,7 +312,7 @@ viac3_crypto_freesession(u_int64_t tid)
free(swd, M_CRYPTO_DATA);
}
- bzero(&sc->sc_sessions[sesn], sizeof(sc->sc_sessions[sesn]));
+ explicit_bzero(&sc->sc_sessions[sesn], sizeof(sc->sc_sessions[sesn]));
return (0);
}
diff --git a/sys/arch/i386/i386/via.c b/sys/arch/i386/i386/via.c
index 351091a7580..e8a9da8a99e 100644
--- a/sys/arch/i386/i386/via.c
+++ b/sys/arch/i386/i386/via.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: via.c,v 1.26 2011/01/11 15:42:04 deraadt Exp $ */
+/* $OpenBSD: via.c,v 1.27 2011/01/12 17:15:20 deraadt Exp $ */
/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */
/*-
@@ -163,7 +163,7 @@ viac3_crypto_newsession(u_int32_t *sidp, struct cryptoini *cri)
if (ses == NULL)
return (ENOMEM);
bcopy(sc->sc_sessions, ses, sesn * sizeof(*ses));
- bzero(sc->sc_sessions, sesn * sizeof(*ses));
+ explicit_bzero(sc->sc_sessions, sesn * sizeof(*ses));
free(sc->sc_sessions, M_DEVBUF);
sc->sc_sessions = ses;
ses = &sc->sc_sessions[sesn];
@@ -313,7 +313,7 @@ viac3_crypto_freesession(u_int64_t tid)
free(swd, M_CRYPTO_DATA);
}
- bzero(&sc->sc_sessions[sesn], sizeof(sc->sc_sessions[sesn]));
+ explicit_bzero(&sc->sc_sessions[sesn], sizeof(sc->sc_sessions[sesn]));
return (0);
}
diff --git a/sys/arch/i386/pci/glxsb.c b/sys/arch/i386/pci/glxsb.c
index a3e4d6685f4..f0d7565c2ec 100644
--- a/sys/arch/i386/pci/glxsb.c
+++ b/sys/arch/i386/pci/glxsb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: glxsb.c,v 1.22 2011/01/11 15:42:05 deraadt Exp $ */
+/* $OpenBSD: glxsb.c,v 1.23 2011/01/12 17:15:23 deraadt Exp $ */
/*
* Copyright (c) 2006 Tom Cosgrove <tom@openbsd.org>
@@ -383,7 +383,7 @@ glxsb_crypto_newsession(uint32_t *sidp, struct cryptoini *cri)
return (ENOMEM);
if (sesn != 0) {
bcopy(sc->sc_sessions, ses, sesn * sizeof(*ses));
- bzero(sc->sc_sessions, sesn * sizeof(*ses));
+ explicit_bzero(sc->sc_sessions, sesn * sizeof(*ses));
free(sc->sc_sessions, M_DEVBUF);
}
sc->sc_sessions = ses;
@@ -531,7 +531,7 @@ glxsb_crypto_freesession(uint64_t tid)
}
free(swd, M_CRYPTO_DATA);
}
- bzero(&sc->sc_sessions[sesn], sizeof(sc->sc_sessions[sesn]));
+ explicit_bzero(&sc->sc_sessions[sesn], sizeof(sc->sc_sessions[sesn]));
return (0);
}