diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2014-11-12 22:11:15 +0800 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2014-11-12 22:11:15 +0800 |
commit | d693ed2a68fae6b84e345a9816636c8c53129fa8 (patch) | |
tree | 0822e63eddbc85188a7530b45484037db3687746 /crypto/wp512.c | |
parent | 59ff0b8d783a0674bf158d8fe83c62ff91a25149 (diff) | |
parent | 3dc713711de22ba8a1e66049fb4c824f48547727 (diff) | |
download | linux-crypto-d693ed2a68fae6b84e345a9816636c8c53129fa8.tar.gz linux-crypto-d693ed2a68fae6b84e345a9816636c8c53129fa8.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/wp512.c')
-rw-r--r-- | crypto/wp512.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/wp512.c b/crypto/wp512.c index 180f1d6e..ec64e776 100644 --- a/crypto/wp512.c +++ b/crypto/wp512.c @@ -1102,8 +1102,8 @@ static int wp384_final(struct shash_desc *desc, u8 *out) u8 D[64]; wp512_final(desc, D); - memcpy (out, D, WP384_DIGEST_SIZE); - memset (D, 0, WP512_DIGEST_SIZE); + memcpy(out, D, WP384_DIGEST_SIZE); + memzero_explicit(D, WP512_DIGEST_SIZE); return 0; } @@ -1113,8 +1113,8 @@ static int wp256_final(struct shash_desc *desc, u8 *out) u8 D[64]; wp512_final(desc, D); - memcpy (out, D, WP256_DIGEST_SIZE); - memset (D, 0, WP512_DIGEST_SIZE); + memcpy(out, D, WP256_DIGEST_SIZE); + memzero_explicit(D, WP512_DIGEST_SIZE); return 0; } |