mirror of
https://github.com/torvalds/linux.git
synced 2024-11-11 14:42:24 +00:00
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu: "This fixes a correctness bug in the ARM64 version of ChaCha for lib/crypto used by WireGuard" * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: arm64/chacha - correctly walk through blocks
This commit is contained in:
commit
979e52ca04
@ -55,10 +55,10 @@ static void chacha_doneon(u32 *state, u8 *dst, const u8 *src,
|
||||
break;
|
||||
}
|
||||
chacha_4block_xor_neon(state, dst, src, nrounds, l);
|
||||
bytes -= CHACHA_BLOCK_SIZE * 5;
|
||||
src += CHACHA_BLOCK_SIZE * 5;
|
||||
dst += CHACHA_BLOCK_SIZE * 5;
|
||||
state[12] += 5;
|
||||
bytes -= l;
|
||||
src += l;
|
||||
dst += l;
|
||||
state[12] += DIV_ROUND_UP(l, CHACHA_BLOCK_SIZE);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -9028,10 +9028,15 @@ bool __init chacha20poly1305_selftest(void)
|
||||
&& total_len <= 1 << 10; ++total_len) {
|
||||
for (i = 0; i <= total_len; ++i) {
|
||||
for (j = i; j <= total_len; ++j) {
|
||||
k = 0;
|
||||
sg_init_table(sg_src, 3);
|
||||
sg_set_buf(&sg_src[0], input, i);
|
||||
sg_set_buf(&sg_src[1], input + i, j - i);
|
||||
sg_set_buf(&sg_src[2], input + j, total_len - j);
|
||||
if (i)
|
||||
sg_set_buf(&sg_src[k++], input, i);
|
||||
if (j - i)
|
||||
sg_set_buf(&sg_src[k++], input + i, j - i);
|
||||
if (total_len - j)
|
||||
sg_set_buf(&sg_src[k++], input + j, total_len - j);
|
||||
sg_init_marker(sg_src, k);
|
||||
memset(computed_output, 0, total_len);
|
||||
memset(input, 0, total_len);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user