Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 078cebb3 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Alistair Delva
Browse files

UPSTREAM: crypto: lib - tidy up lib/crypto Kconfig and Makefile 



In preparation of introducing a set of crypto library interfaces, tidy
up the Makefile and split off the Kconfig symbols into a separate file.

Bug: 152722841
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
(cherry picked from commit 746b2e024c67aa605ac12d135cd7085a49cf9dc4)
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Idc1e996e91db5909dd8f1d2d52c1727c2de2b1f6
parent 160ab931

crypto/Kconfig

+1 −12
Original line number Diff line number Diff line
@@ -878,9 +878,6 @@ config CRYPTO_SHA1_PPC_SPE 
	  SHA-1 secure hash standard (DFIPS 180-4) implemented

	  using powerpc SPE SIMD instruction set.



config CRYPTO_LIB_SHA256

	tristate



config CRYPTO_SHA256

	tristate "SHA224 and SHA256 digest algorithm"

	select CRYPTO_HASH
@@ -1019,9 +1016,6 @@ config CRYPTO_GHASH_CLMUL_NI_INTEL 


comment "Ciphers"



config CRYPTO_LIB_AES

	tristate



config CRYPTO_AES

	tristate "AES cipher algorithms"

	select CRYPTO_ALGAPI
@@ -1150,9 +1144,6 @@ config CRYPTO_ANUBIS 
	  <https://www.cosic.esat.kuleuven.be/nessie/reports/>

	  <http://www.larc.usp.br/~pbarreto/AnubisPage.html>



config CRYPTO_LIB_ARC4

	tristate



config CRYPTO_ARC4

	tristate "ARC4 cipher algorithm"

	select CRYPTO_BLKCIPHER
@@ -1339,9 +1330,6 @@ config CRYPTO_CAST6_AVX_X86_64 
	  This module provides the Cast6 cipher algorithm that processes

	  eight blocks parallel using the AVX instruction set.



config CRYPTO_LIB_DES

	tristate



config CRYPTO_DES

	tristate "DES and Triple DES EDE cipher algorithms"

	select CRYPTO_ALGAPI
@@ -1845,6 +1833,7 @@ config CRYPTO_STATS 
config CRYPTO_HASH_INFO

	bool



source "lib/crypto/Kconfig"

source "drivers/crypto/Kconfig"

source "crypto/asymmetric_keys/Kconfig"

source "certs/Kconfig"

lib/crypto/Kconfig

0 → 100644
+15 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



comment "Crypto library routines"



config CRYPTO_LIB_AES

	tristate



config CRYPTO_LIB_ARC4

	tristate



config CRYPTO_LIB_DES

	tristate



config CRYPTO_LIB_SHA256

	tristate

lib/crypto/Makefile

+8 −8

File changed.

Contains only whitespace changes.