diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2018-08-03 17:55:12 +0800 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2018-08-03 17:55:12 +0800 |
| commit | 777cd605441d129f14db2b970a0684d60ed2b167 (patch) | |
| tree | 7909395a3705609b7c1a31f25dd9b2f9e5d7cffb /crypto/morus640.c | |
| parent | 348f248cd01ef31296b73aaff7fe86ee92b6a825 (diff) | |
| parent | 544545e88de8a0b644b13b740b307a2f10ee0f40 (diff) | |
| download | linux-crypto-777cd605441d129f14db2b970a0684d60ed2b167.tar.gz linux-crypto-777cd605441d129f14db2b970a0684d60ed2b167.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Merge mainline to pick up c7513c2a2714 ("crypto/arm64: aes-ce-gcm -
add missing kernel_neon_begin/end pair").
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 5c48a7cb..1ca76e54 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); |