diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-10-27 14:11:07 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-10-27 14:11:07 +0100 |
| commit | 85c24cd8d3676cbae9e8809e894e68025c6d497e (patch) | |
| tree | 024c4b655c1a8e6943ed8e75b64be38980508cfe /crypto/sha1_generic.c | |
| parent | 49d776ffb50f2e428aafb6a6576e58e80f1e886c (diff) | |
| parent | d1d0b6b668818571122d30d68a0b3f768bd83a52 (diff) | |
| download | blackbird-op-linux-85c24cd8d3676cbae9e8809e894e68025c6d497e.tar.gz blackbird-op-linux-85c24cd8d3676cbae9e8809e894e68025c6d497e.zip | |
Merge branch 'for-linus' into for-next
Merged upstream branch to make further fireworks development easier
(and avoid conflicts earlier).
Conflicts:
sound/firewire/bebob/bebob_focusrite.c
Diffstat (limited to 'crypto/sha1_generic.c')
| -rw-r--r-- | crypto/sha1_generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/sha1_generic.c b/crypto/sha1_generic.c index 42794803c480..7bb047432782 100644 --- a/crypto/sha1_generic.c +++ b/crypto/sha1_generic.c @@ -64,7 +64,7 @@ int crypto_sha1_update(struct shash_desc *desc, const u8 *data, src = data + done; } while (done + SHA1_BLOCK_SIZE <= len); - memset(temp, 0, sizeof(temp)); + memzero_explicit(temp, sizeof(temp)); partial = 0; } memcpy(sctx->buffer + partial, src, len - done); |
