diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-24 21:33:32 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-24 21:33:32 +0200 |
| commit | 14d4cc08832efb724e58944ba2ac22e2ca3143dc (patch) | |
| tree | febca1365a5306d5a44b2481ec41f13f4c2defc2 /crypto/sha512_generic.c | |
| parent | Merge tag 'pm+acpi-3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | crypto: memzero_explicit - make sure to clear out sensitive data (diff) | |
| download | linux-14d4cc08832efb724e58944ba2ac22e2ca3143dc.tar.xz linux-14d4cc08832efb724e58944ba2ac22e2ca3143dc.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/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; } |