diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2018-08-20 18:05:17 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2018-08-20 18:05:17 +0200 |
| commit | 52809a360945ab1f87eea8ebed524f725be9ad88 (patch) | |
| tree | fc620383397a212bc66630c86fbbd6adb2e32f40 /crypto/morus640.c | |
| parent | d7c5fbc31d674b124b89d3ddb51892cf24ad2ad5 (diff) | |
| parent | ea2d7a962774232c5ec13f85a399e7f2a7b6746e (diff) | |
| download | linux-crypto-52809a360945ab1f87eea8ebed524f725be9ad88.tar.gz linux-crypto-52809a360945ab1f87eea8ebed524f725be9ad88.zip | |
Merge branch 'for-4.19/cougar' into for-linus
New device support for hid-cougar
Diffstat (limited to 'crypto/morus640.c')
| -rw-r--r-- | crypto/morus640.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/morus640.c b/crypto/morus640.c index 9fbcde30..5eede374 100644 --- a/crypto/morus640.c +++ b/crypto/morus640.c @@ -274,8 +274,9 @@ static void crypto_morus640_decrypt_chunk(struct morus640_state *state, u8 *dst, union morus640_block_in tail; memcpy(tail.bytes, src, size); + memset(tail.bytes + size, 0, MORUS640_BLOCK_SIZE - size); - crypto_morus640_load_a(&m, src); + crypto_morus640_load_a(&m, tail.bytes); crypto_morus640_core(state, &m); crypto_morus640_store_a(tail.bytes, &m); memset(tail.bytes + size, 0, MORUS640_BLOCK_SIZE - size); |