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>
		
			
				
	
	
		
			41 lines
		
	
	
		
			1.2 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			41 lines
		
	
	
		
			1.2 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 | 
						|
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
 | 
						|
Date: Fri, 17 Jan 2020 12:01:36 +0100
 | 
						|
Subject: [PATCH] crypto: Kconfig - allow tests to be disabled when manager is
 | 
						|
 disabled
 | 
						|
 | 
						|
commit 2343d1529aff8b552589f622c23932035ed7a05d upstream.
 | 
						|
 | 
						|
The library code uses CRYPTO_MANAGER_DISABLE_TESTS to conditionalize its
 | 
						|
tests, but the library code can also exist without CRYPTO_MANAGER. That
 | 
						|
means on minimal configs, the test code winds up being built with no way
 | 
						|
to disable it.
 | 
						|
 | 
						|
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 | 4 ----
 | 
						|
 1 file changed, 4 deletions(-)
 | 
						|
 | 
						|
--- a/crypto/Kconfig
 | 
						|
+++ b/crypto/Kconfig
 | 
						|
@@ -136,8 +136,6 @@ config CRYPTO_USER
 | 
						|
 	  Userspace configuration for cryptographic instantiations such as
 | 
						|
 	  cbc(aes).
 | 
						|
 
 | 
						|
-if CRYPTO_MANAGER2
 | 
						|
-
 | 
						|
 config CRYPTO_MANAGER_DISABLE_TESTS
 | 
						|
 	bool "Disable run-time self tests"
 | 
						|
 	default y
 | 
						|
@@ -155,8 +153,6 @@ config CRYPTO_MANAGER_EXTRA_TESTS
 | 
						|
 	  This is intended for developer use only, as these tests take much
 | 
						|
 	  longer to run than the normal self tests.
 | 
						|
 
 | 
						|
-endif	# if CRYPTO_MANAGER2
 | 
						|
-
 | 
						|
 config CRYPTO_GF128MUL
 | 
						|
 	tristate
 | 
						|
 
 |