diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-01-11 15:42:07 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-01-11 15:42:07 +0000 |
| commit | b8adaa72672fc21a17c44baf5ab66efb66e8c6f1 (patch) | |
| tree | 553d59faec2af2eebc1396c6fa7c4f2c9f277c35 /sys/crypto/hmac.c | |
| parent | c9145e6ecb84db6c26896fbf4b51a9a25172e9b2 (diff) | |
for key material that is being being discarded, convert bzero() to
explicit_bzero() where required
ok markus mikeb
Diffstat (limited to 'sys/crypto/hmac.c')
| -rw-r--r-- | sys/crypto/hmac.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/crypto/hmac.c b/sys/crypto/hmac.c index 0922af34b79..118f9a760d9 100644 --- a/sys/crypto/hmac.c +++ b/sys/crypto/hmac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: hmac.c,v 1.2 2008/09/06 22:23:20 djm Exp $ */ +/* $OpenBSD: hmac.c,v 1.3 2011/01/11 15:42:05 deraadt Exp $ */ /*- * Copyright (c) 2008 Damien Bergamini <damien.bergamini@free.fr> @@ -53,7 +53,7 @@ HMAC_MD5_Init(HMAC_MD5_CTX *ctx, const u_int8_t *key, u_int key_len) MD5Init(&ctx->ctx); MD5Update(&ctx->ctx, k_ipad, MD5_BLOCK_LENGTH); - bzero(k_ipad, sizeof k_ipad); + explicit_bzero(k_ipad, sizeof k_ipad); } void @@ -80,7 +80,7 @@ HMAC_MD5_Final(u_int8_t digest[MD5_DIGEST_LENGTH], HMAC_MD5_CTX *ctx) MD5Update(&ctx->ctx, digest, MD5_DIGEST_LENGTH); MD5Final(digest, &ctx->ctx); - bzero(k_opad, sizeof k_opad); + explicit_bzero(k_opad, sizeof k_opad); } void @@ -107,7 +107,7 @@ HMAC_SHA1_Init(HMAC_SHA1_CTX *ctx, const u_int8_t *key, u_int key_len) SHA1Init(&ctx->ctx); SHA1Update(&ctx->ctx, k_ipad, SHA1_BLOCK_LENGTH); - bzero(k_ipad, sizeof k_ipad); + explicit_bzero(k_ipad, sizeof k_ipad); } void @@ -134,7 +134,7 @@ HMAC_SHA1_Final(u_int8_t digest[SHA1_DIGEST_LENGTH], HMAC_SHA1_CTX *ctx) SHA1Update(&ctx->ctx, digest, SHA1_DIGEST_LENGTH); SHA1Final(digest, &ctx->ctx); - bzero(k_opad, sizeof k_opad); + explicit_bzero(k_opad, sizeof k_opad); } void @@ -161,7 +161,7 @@ HMAC_SHA256_Init(HMAC_SHA256_CTX *ctx, const u_int8_t *key, u_int key_len) SHA256Init(&ctx->ctx); SHA256Update(&ctx->ctx, k_ipad, SHA256_BLOCK_LENGTH); - bzero(k_ipad, sizeof k_ipad); + explicit_bzero(k_ipad, sizeof k_ipad); } void @@ -188,5 +188,5 @@ HMAC_SHA256_Final(u_int8_t digest[SHA256_DIGEST_LENGTH], HMAC_SHA256_CTX *ctx) SHA256Update(&ctx->ctx, digest, SHA256_DIGEST_LENGTH); SHA256Final(digest, &ctx->ctx); - bzero(k_opad, sizeof k_opad); + explicit_bzero(k_opad, sizeof k_opad); } |