diff options
| author | riastradh <riastradh@NetBSD.org> | 2013-06-24 04:21:19 +0000 |
|---|---|---|
| committer | riastradh <riastradh@NetBSD.org> | 2013-06-24 04:21:19 +0000 |
| commit | adfdcceb8aad478bc3c5692fb3aff045c0c8ef37 (patch) | |
| tree | ee62fd1d002750ee339715e953885019cf401475 /sys/opencrypto/cryptosoft.c | |
| parent | 8fcb059d64019ef3a03b90cb11f6c6d47aeeb6b9 (diff) | |
Replace consttime_bcmp/explicit_bzero by consttime_memequal/explicit_memset.
consttime_memequal is the same as the old consttime_bcmp.
explicit_memset is to memset as explicit_bzero was to bcmp.
Passes amd64 release and i386/ALL, but I'm sure I missed some spots,
so please let me know.
Diffstat (limited to 'sys/opencrypto/cryptosoft.c')
| -rw-r--r-- | sys/opencrypto/cryptosoft.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/opencrypto/cryptosoft.c b/sys/opencrypto/cryptosoft.c index 623fa2d827b..7cfd7e4b9f5 100644 --- a/sys/opencrypto/cryptosoft.c +++ b/sys/opencrypto/cryptosoft.c @@ -1,4 +1,4 @@ -/* $NetBSD: cryptosoft.c,v 1.41 2013/02/02 21:38:24 christos Exp $ */ +/* $NetBSD: cryptosoft.c,v 1.42 2013/06/24 04:21:20 riastradh Exp $ */ /* $FreeBSD: src/sys/opencrypto/cryptosoft.c,v 1.2.2.1 2002/11/21 23:34:23 sam Exp $ */ /* $OpenBSD: cryptosoft.c,v 1.35 2002/04/26 08:43:50 deraadt Exp $ */ @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cryptosoft.c,v 1.41 2013/02/02 21:38:24 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cryptosoft.c,v 1.42 2013/06/24 04:21:20 riastradh Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1090,11 +1090,11 @@ swcr_freesession(void *arg, u_int64_t tid) axf = swd->sw_axf; if (swd->sw_ictx) { - explicit_bzero(swd->sw_ictx, axf->ctxsize); + explicit_memset(swd->sw_ictx, 0, axf->ctxsize); free(swd->sw_ictx, M_CRYPTO_DATA); } if (swd->sw_octx) { - explicit_bzero(swd->sw_octx, axf->ctxsize); + explicit_memset(swd->sw_octx, 0, axf->ctxsize); free(swd->sw_octx, M_CRYPTO_DATA); } break; @@ -1104,11 +1104,11 @@ swcr_freesession(void *arg, u_int64_t tid) axf = swd->sw_axf; if (swd->sw_ictx) { - explicit_bzero(swd->sw_ictx, axf->ctxsize); + explicit_memset(swd->sw_ictx, 0, axf->ctxsize); free(swd->sw_ictx, M_CRYPTO_DATA); } if (swd->sw_octx) { - explicit_bzero(swd->sw_octx, swd->sw_klen); + explicit_memset(swd->sw_octx, 0, swd->sw_klen); free(swd->sw_octx, M_CRYPTO_DATA); } break; @@ -1122,7 +1122,7 @@ swcr_freesession(void *arg, u_int64_t tid) axf = swd->sw_axf; if (swd->sw_ictx) { - explicit_bzero(swd->sw_ictx, axf->ctxsize); + explicit_memset(swd->sw_ictx, 0, axf->ctxsize); free(swd->sw_ictx, M_CRYPTO_DATA); } break; |
