tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

Ard Biesheuvel and committed by
Herbert Xu 746b2e02 20cc01ba

+24 -20
+1 -12
crypto/Kconfig
··· 895 895 SHA-1 secure hash standard (DFIPS 180-4) implemented 896 896 using powerpc SPE SIMD instruction set. 897 897 898 - config CRYPTO_LIB_SHA256 899 - tristate 900 - 901 898 config CRYPTO_SHA256 902 899 tristate "SHA224 and SHA256 digest algorithm" 903 900 select CRYPTO_HASH ··· 1033 1036 1034 1037 comment "Ciphers" 1035 1038 1036 - config CRYPTO_LIB_AES 1037 - tristate 1038 - 1039 1039 config CRYPTO_AES 1040 1040 tristate "AES cipher algorithms" 1041 1041 select CRYPTO_ALGAPI ··· 1160 1166 See also: 1161 1167 <https://www.cosic.esat.kuleuven.be/nessie/reports/> 1162 1168 <http://www.larc.usp.br/~pbarreto/AnubisPage.html> 1163 - 1164 - config CRYPTO_LIB_ARC4 1165 - tristate 1166 1169 1167 1170 config CRYPTO_ARC4 1168 1171 tristate "ARC4 cipher algorithm" ··· 1347 1356 1348 1357 This module provides the Cast6 cipher algorithm that processes 1349 1358 eight blocks parallel using the AVX instruction set. 1350 - 1351 - config CRYPTO_LIB_DES 1352 - tristate 1353 1359 1354 1360 config CRYPTO_DES 1355 1361 tristate "DES and Triple DES EDE cipher algorithms" ··· 1852 1864 config CRYPTO_HASH_INFO 1853 1865 bool 1854 1866 1867 + source "lib/crypto/Kconfig" 1855 1868 source "drivers/crypto/Kconfig" 1856 1869 source "crypto/asymmetric_keys/Kconfig" 1857 1870 source "certs/Kconfig"
+15
lib/crypto/Kconfig
··· 1 + # SPDX-License-Identifier: GPL-2.0 2 + 3 + comment "Crypto library routines" 4 + 5 + config CRYPTO_LIB_AES 6 + tristate 7 + 8 + config CRYPTO_LIB_ARC4 9 + tristate 10 + 11 + config CRYPTO_LIB_DES 12 + tristate 13 + 14 + config CRYPTO_LIB_SHA256 15 + tristate
+8 -8
lib/crypto/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 2 3 - obj-$(CONFIG_CRYPTO_LIB_AES) += libaes.o 4 - libaes-y := aes.o 3 + obj-$(CONFIG_CRYPTO_LIB_AES) += libaes.o 4 + libaes-y := aes.o 5 5 6 - obj-$(CONFIG_CRYPTO_LIB_ARC4) += libarc4.o 7 - libarc4-y := arc4.o 6 + obj-$(CONFIG_CRYPTO_LIB_ARC4) += libarc4.o 7 + libarc4-y := arc4.o 8 8 9 - obj-$(CONFIG_CRYPTO_LIB_DES) += libdes.o 10 - libdes-y := des.o 9 + obj-$(CONFIG_CRYPTO_LIB_DES) += libdes.o 10 + libdes-y := des.o 11 11 12 - obj-$(CONFIG_CRYPTO_LIB_SHA256) += libsha256.o 13 - libsha256-y := sha256.o 12 + obj-$(CONFIG_CRYPTO_LIB_SHA256) += libsha256.o 13 + libsha256-y := sha256.o