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>
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
|
|
Date: Mon, 2 Nov 2020 14:48:15 +0100
|
|
Subject: [PATCH] crypto: Kconfig - CRYPTO_MANAGER_EXTRA_TESTS requires the
|
|
manager
|
|
|
|
commit 6569e3097f1c4a490bdf2b23d326855e04942dfd upstream.
|
|
|
|
The extra tests in the manager actually require the manager to be
|
|
selected too. Otherwise the linker gives errors like:
|
|
|
|
ld: arch/x86/crypto/chacha_glue.o: in function `chacha_simd_stream_xor':
|
|
chacha_glue.c:(.text+0x422): undefined reference to `crypto_simd_disabled_for_test'
|
|
|
|
Fixes: 2343d1529aff ("crypto: Kconfig - allow tests to be disabled when manager is disabled")
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
|
|
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
|
---
|
|
crypto/Kconfig | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
--- a/crypto/Kconfig
|
|
+++ b/crypto/Kconfig
|
|
@@ -145,7 +145,7 @@ config CRYPTO_MANAGER_DISABLE_TESTS
|
|
|
|
config CRYPTO_MANAGER_EXTRA_TESTS
|
|
bool "Enable extra run-time crypto self tests"
|
|
- depends on DEBUG_KERNEL && !CRYPTO_MANAGER_DISABLE_TESTS
|
|
+ depends on DEBUG_KERNEL && !CRYPTO_MANAGER_DISABLE_TESTS && CRYPTO_MANAGER
|
|
help
|
|
Enable extra run-time self tests of registered crypto algorithms,
|
|
including randomized fuzz tests.
|