diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-24 12:33:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-24 12:33:32 -0700 |
| commit | c8c48001eb241f335739ef06492ae99b4cd891d6 (patch) | |
| tree | 14b6f6d514b25ffb16981a2867c6902edf41b685 /crypto/vmac.c | |
| parent | 6de0bdb30d75edcf5f1e3f80da5b65670b9831f1 (diff) | |
| parent | 8ff8c72485c0d0bbb91377d33bbf016ae0744cd8 (diff) | |
| download | linux-crypto-c8c48001eb241f335739ef06492ae99b4cd891d6.tar.gz linux-crypto-c8c48001eb241f335739ef06492ae99b4cd891d6.zip | |
Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random
Pull /dev/random updates from Ted Ts'o:
"This adds a memzero_explicit() call which is guaranteed not to be
optimized away by GCC. This is important when we are wiping
cryptographically sensitive material"
* tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
crypto: memzero_explicit - make sure to clear out sensitive data
random: add and use memzero_explicit() for clearing data
Diffstat (limited to 'crypto/vmac.c')
| -rw-r--r-- | crypto/vmac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/vmac.c b/crypto/vmac.c index 2eb11a30..d84c24bd 100644 --- a/crypto/vmac.c +++ b/crypto/vmac.c @@ -613,7 +613,7 @@ static int vmac_final(struct shash_desc *pdesc, u8 *out) } mac = vmac(ctx->partial, ctx->partial_size, nonce, NULL, ctx); memcpy(out, &mac, sizeof(vmac_t)); - memset(&mac, 0, sizeof(vmac_t)); + memzero_explicit(&mac, sizeof(vmac_t)); memset(&ctx->__vmac_ctx, 0, sizeof(struct vmac_ctx)); ctx->partial_size = 0; return 0; |