diff options
author | Thierry Reding <treding@nvidia.com> | 2014-11-26 09:41:09 +0100 |
---|---|---|
committer | Thierry Reding <treding@nvidia.com> | 2014-11-26 09:42:11 +0100 |
commit | db85fba98caa6ea9e54e93b33df8fdbadf6d20df (patch) | |
tree | 14b6f6d514b25ffb16981a2867c6902edf41b685 /crypto/wp512.c | |
parent | 6de0bdb30d75edcf5f1e3f80da5b65670b9831f1 (diff) | |
parent | 3dc713711de22ba8a1e66049fb4c824f48547727 (diff) | |
download | linux-crypto-db85fba98caa6ea9e54e93b33df8fdbadf6d20df.tar.gz linux-crypto-db85fba98caa6ea9e54e93b33df8fdbadf6d20df.zip |
Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
This branch contains a couple of changes that will conflict with the
Tegra SMMU driver rewrite. Since the driver is largely rewritten the
conflict resolution is non-trivial.
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; } |