projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'regmap/fix/cache' into regmap-linus
[linux-2.6-block.git]
/
crypto
/
sha256_generic.c
diff --git
a/crypto/sha256_generic.c
b/crypto/sha256_generic.c
index 0bb5583446993aae173c0b7c015b0db9214f723f..65e7b76b057fcddc8f88a04d54b678df245a8c85 100644
(file)
--- a/
crypto/sha256_generic.c
+++ b/
crypto/sha256_generic.c
@@
-211,10
+211,9
@@
static void sha256_transform(u32 *state, const u8 *input)
/* clear any sensitive info... */
a = b = c = d = e = f = g = h = t1 = t2 = 0;
/* clear any sensitive info... */
a = b = c = d = e = f = g = h = t1 = t2 = 0;
- mem
set(W, 0
, 64 * sizeof(u32));
+ mem
zero_explicit(W
, 64 * sizeof(u32));
}
}
-
static int sha224_init(struct shash_desc *desc)
{
struct sha256_state *sctx = shash_desc_ctx(desc);
static int sha224_init(struct shash_desc *desc)
{
struct sha256_state *sctx = shash_desc_ctx(desc);
@@
-317,7
+316,7
@@
static int sha224_final(struct shash_desc *desc, u8 *hash)
sha256_final(desc, D);
memcpy(hash, D, SHA224_DIGEST_SIZE);
sha256_final(desc, D);
memcpy(hash, D, SHA224_DIGEST_SIZE);
- mem
set(D, 0
, SHA256_DIGEST_SIZE);
+ mem
zero_explicit(D
, SHA256_DIGEST_SIZE);
return 0;
}
return 0;
}