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/tgr192.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/tgr192.c')
| -rw-r--r-- | crypto/tgr192.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/tgr192.c b/crypto/tgr192.c index 87403556..3c7af0d1 100644 --- a/crypto/tgr192.c +++ b/crypto/tgr192.c @@ -612,7 +612,7 @@ static int tgr160_final(struct shash_desc *desc, u8 * out) tgr192_final(desc, D); memcpy(out, D, TGR160_DIGEST_SIZE); - memset(D, 0, TGR192_DIGEST_SIZE); + memzero_explicit(D, TGR192_DIGEST_SIZE); return 0; } @@ -623,7 +623,7 @@ static int tgr128_final(struct shash_desc *desc, u8 * out) tgr192_final(desc, D); memcpy(out, D, TGR128_DIGEST_SIZE); - memset(D, 0, TGR192_DIGEST_SIZE); + memzero_explicit(D, TGR192_DIGEST_SIZE); return 0; } |