diff options
| author | Rich Felker <dalias@libc.org> | 2016-03-29 21:53:03 +0000 |
|---|---|---|
| committer | Rich Felker <dalias@libc.org> | 2016-03-29 21:53:03 +0000 |
| commit | ed8b19a674c67e1007990991d4e02c02da07c952 (patch) | |
| tree | 230d118992bfd9ac76f80822d34c2f4ea9819a44 /crypto/keywrap.c | |
| parent | 5da64d0814134dc3542fb314a66dcdf74e8553bd (diff) | |
| parent | f349a25c7c6b753176540d10e6c243047faefa3a (diff) | |
| download | linux-crypto-ed8b19a674c67e1007990991d4e02c02da07c952.tar.gz linux-crypto-ed8b19a674c67e1007990991d4e02c02da07c952.zip | |
Merge tag 'v4.6-rc1'
Linux 4.6-rc1
Diffstat (limited to '')
| -rw-r--r-- | crypto/keywrap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/keywrap.c b/crypto/keywrap.c index b1d106ce..72014f96 100644 --- a/crypto/keywrap.c +++ b/crypto/keywrap.c @@ -212,7 +212,7 @@ static int crypto_kw_decrypt(struct blkcipher_desc *desc, SEMIBSIZE)) ret = -EBADMSG; - memzero_explicit(&block, sizeof(struct crypto_kw_block)); + memzero_explicit(block, sizeof(struct crypto_kw_block)); return ret; } @@ -297,7 +297,7 @@ static int crypto_kw_encrypt(struct blkcipher_desc *desc, /* establish the IV for the caller to pick up */ memcpy(desc->info, block->A, SEMIBSIZE); - memzero_explicit(&block, sizeof(struct crypto_kw_block)); + memzero_explicit(block, sizeof(struct crypto_kw_block)); return 0; } |