diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2014-11-12 15:11:15 +0100 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2014-11-12 15:11:15 +0100 |
| commit | 4c7912e9198b141b6cd85999d28b48cb5a037aa0 (patch) | |
| tree | 901b2bc822976f6092fd06c709876e96d78bd50d /crypto/sha512_generic.c | |
| parent | crypto: ux500/hash - Silence compiler warning for !CONFIG_PM (diff) | |
| parent | Linux 3.18-rc4 (diff) | |
| download | linux-4c7912e9198b141b6cd85999d28b48cb5a037aa0.tar.xz linux-4c7912e9198b141b6cd85999d28b48cb5a037aa0.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merging 3.18-rc4 in order to pick up the memzero_explicit helper.
Diffstat (limited to 'crypto/sha512_generic.c')
| -rw-r--r-- | crypto/sha512_generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/sha512_generic.c b/crypto/sha512_generic.c index 6dde57dc511b..95db67197cd9 100644 --- a/crypto/sha512_generic.c +++ b/crypto/sha512_generic.c @@ -239,7 +239,7 @@ static int sha384_final(struct shash_desc *desc, u8 *hash) sha512_final(desc, D); memcpy(hash, D, 48); - memset(D, 0, 64); + memzero_explicit(D, 64); return 0; } |