| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| From: Ard Biesheuvel <ardb@kernel.org> |
| Date: Fri, 8 Nov 2019 13:22:07 +0100 |
| Subject: [PATCH] crypto: lib - tidy up lib/crypto Kconfig and Makefile |
| |
| commit 746b2e024c67aa605ac12d135cd7085a49cf9dc4 upstream. |
| |
| In preparation of introducing a set of crypto library interfaces, tidy |
| up the Makefile and split off the Kconfig symbols into a separate file. |
| |
| Signed-off-by: Ard Biesheuvel <ardb@kernel.org> |
| Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> |
| Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> |
| --- |
| crypto/Kconfig | 13 +------------ |
| lib/crypto/Kconfig | 15 +++++++++++++++ |
| lib/crypto/Makefile | 16 ++++++++-------- |
| 3 files changed, 24 insertions(+), 20 deletions(-) |
| create mode 100644 lib/crypto/Kconfig |
| |
| --- a/crypto/Kconfig |
| +++ b/crypto/Kconfig |
| @@ -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" |
| --- /dev/null |
| +++ b/lib/crypto/Kconfig |
| @@ -0,0 +1,15 @@ |
| +# 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 |
| --- a/lib/crypto/Makefile |
| +++ b/lib/crypto/Makefile |
| @@ -1,16 +1,16 @@ |
| # SPDX-License-Identifier: GPL-2.0 |
| |
| -obj-$(CONFIG_CRYPTO_LIB_AES) += libaes.o |
| -libaes-y := aes.o |
| +obj-$(CONFIG_CRYPTO_LIB_AES) += libaes.o |
| +libaes-y := aes.o |
| |
| -obj-$(CONFIG_CRYPTO_LIB_ARC4) += libarc4.o |
| -libarc4-y := arc4.o |
| +obj-$(CONFIG_CRYPTO_LIB_ARC4) += libarc4.o |
| +libarc4-y := arc4.o |
| |
| -obj-$(CONFIG_CRYPTO_LIB_DES) += libdes.o |
| -libdes-y := des.o |
| +obj-$(CONFIG_CRYPTO_LIB_DES) += libdes.o |
| +libdes-y := des.o |
| |
| -obj-$(CONFIG_CRYPTO_LIB_SHA256) += libsha256.o |
| -libsha256-y := sha256.o |
| +obj-$(CONFIG_CRYPTO_LIB_SHA256) += libsha256.o |
| +libsha256-y := sha256.o |
| |
| obj-y += libblake2s.o |
| libblake2s-y += blake2s.o blake2s-generic.o |