diff options
| author | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-10-28 09:22:17 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-10-28 09:22:17 -0200 |
| commit | abb6dbf1c37498421452fa3b3930a193e2a02356 (patch) | |
| tree | 14b6f6d514b25ffb16981a2867c6902edf41b685 /crypto/sha256_generic.c | |
| parent | bd7de9f0357f8c0b91538b2a461b5403f0d7ff13 (diff) | |
| parent | 3dc713711de22ba8a1e66049fb4c824f48547727 (diff) | |
| download | linux-crypto-abb6dbf1c37498421452fa3b3930a193e2a02356.tar.gz linux-crypto-abb6dbf1c37498421452fa3b3930a193e2a02356.zip | |
Merge remote-tracking branch 'linus/master' into patchwork
Merge back media fixes applied upstream.
* linus/master: (457 commits)
Linux 3.18-rc2
ARM: dts: imx28-evk: Let i2c0 run at 100kHz
ARM: i.MX6: Fix "emi" clock name typo
overlayfs: embed middle into overlay_readdir_data
overlayfs: embed root into overlay_readdir_data
overlayfs: make ovl_cache_entry->name an array instead of pointer
overlayfs: don't hold ->i_mutex over opening the real directory
arm64: Fix memblock current_limit with 64K pages and 48-bit VA
sparc64: Implement __get_user_pages_fast().
sparc64: Fix register corruption in top-most kernel stack frame during boot.
arm64: ASLR: Don't randomise text when randomise_va_space == 0
[media] s5p-jpeg: Avoid -Wuninitialized warning in s5p_jpeg_parse_hdr
[media] s5p-fimc: Only build suspend/resume for PM
[media] s5p-jpeg: Only build suspend/resume for PM
[media] Remove references to non-existent PLAT_S5P symbol
MIPS: SEAD3: Fix I2C device registration.
[media] videobuf-dma-contig: set vm_pgoff to be zero to pass the sanity check in vm_iomap_memory()
[media] tw68: remove bogus I2C_ALGOBIT dependency
kvm: vfio: fix unregister kvm_device_ops of vfio
KVM: x86: Wrong assertion on paging_tmpl.h
...
Diffstat (limited to 'crypto/sha256_generic.c')
| -rw-r--r-- | crypto/sha256_generic.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/crypto/sha256_generic.c b/crypto/sha256_generic.c index 0bb55834..65e7b76b 100644 --- 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; - memset(W, 0, 64 * sizeof(u32)); + memzero_explicit(W, 64 * sizeof(u32)); } - 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); - memset(D, 0, SHA256_DIGEST_SIZE); + memzero_explicit(D, SHA256_DIGEST_SIZE); return 0; } |