mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-25 08:21:14 +00:00
d540725871
Without this patch, the chacha block counter is not incremented on neon rounds, resulting in incorrect calculations and corrupt packets. This also switches to using `--no-numbered --zero-commit` so that future diffs are smaller. Reported-by: Hans Geiblinger <cybrnook2002@yahoo.com> Reviewed-by: Ilya Lipnitskiy <ilya.lipnitskiy@gmail.com> Cc: David Bauer <mail@david-bauer.net> Cc: Petr Štetiar <ynezz@true.cz> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
30 lines
1023 B
Diff
30 lines
1023 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Herbert Xu <herbert@gondor.apana.org.au>
|
|
Date: Thu, 24 Sep 2020 13:29:04 +1000
|
|
Subject: [PATCH] crypto: x86/poly1305 - Remove assignments with no effect
|
|
|
|
commit 4a0c1de64bf9d9027a6f19adfba89fc27893db23 upstream.
|
|
|
|
This patch removes a few ineffectual assignments from the function
|
|
crypto_poly1305_setdctxkey.
|
|
|
|
Reported-by: kernel test robot <lkp@intel.com>
|
|
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
---
|
|
arch/x86/crypto/poly1305_glue.c | 3 ---
|
|
1 file changed, 3 deletions(-)
|
|
|
|
--- a/arch/x86/crypto/poly1305_glue.c
|
|
+++ b/arch/x86/crypto/poly1305_glue.c
|
|
@@ -157,9 +157,6 @@ static unsigned int crypto_poly1305_setd
|
|
dctx->s[1] = get_unaligned_le32(&inp[4]);
|
|
dctx->s[2] = get_unaligned_le32(&inp[8]);
|
|
dctx->s[3] = get_unaligned_le32(&inp[12]);
|
|
- inp += POLY1305_BLOCK_SIZE;
|
|
- len -= POLY1305_BLOCK_SIZE;
|
|
- acc += POLY1305_BLOCK_SIZE;
|
|
dctx->sset = true;
|
|
}
|
|
}
|