Commit aacb37f5 authored Jun 30, 2025 by Eric Biggers

lib/crypto: hash_info: Move hash_info.c into lib/crypto/



crypto/hash_info.c just contains a couple of arrays that map HASH_ALGO_*
algorithm IDs to properties of those algorithms.  It is compiled only
when CRYPTO_HASH_INFO=y, but currently CRYPTO_HASH_INFO depends on
CRYPTO.  Since this can be useful without the old-school crypto API,
move it into lib/crypto/ so that it no longer depends on CRYPTO.

This eliminates the need for FS_VERITY to select CRYPTO after it's been
converted to use lib/crypto/.

Acked-by: Ard Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20250630172224.46909-2-ebiggers@kernel.org


Signed-off-by: Eric Biggers <ebiggers@kernel.org>

parent 57b15e92

crypto/Kconfig

+0 −3

Original line number	Diff line number	Diff line
		@@ -1422,9 +1422,6 @@ config CRYPTO_USER_API_ENABLE_OBSOLETE

		endmenu

		config CRYPTO_HASH_INFO
		bool

		if !KMSAN # avoid false positives from assembly
		if ARM
		source "arch/arm/crypto/Kconfig"

crypto/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -204,7 +204,6 @@ obj-$(CONFIG_CRYPTO_ECRDSA) += ecrdsa_generic.o
		obj-$(CONFIG_XOR_BLOCKS) += xor.o
		obj-$(CONFIG_ASYNC_CORE) += async_tx/
		obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += asymmetric_keys/
		obj-$(CONFIG_CRYPTO_HASH_INFO) += hash_info.o
		crypto_simd-y := simd.o
		obj-$(CONFIG_CRYPTO_SIMD) += crypto_simd.o

lib/crypto/Kconfig

+3 −0

Original line number	Diff line number	Diff line
		@@ -2,6 +2,9 @@

		menu "Crypto library routines"

		config CRYPTO_HASH_INFO
		bool

		config CRYPTO_LIB_UTILS
		tristate

lib/crypto/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,8 @@ quiet_cmd_perlasm = PERLASM $@
		quiet_cmd_perlasm_with_args = PERLASM $@
		cmd_perlasm_with_args = $(PERL) $(<) void $(@)

		obj-$(CONFIG_CRYPTO_HASH_INFO) += hash_info.o

		obj-$(CONFIG_CRYPTO_LIB_UTILS) += libcryptoutils.o
		libcryptoutils-y := memneq.o utils.o

crypto/hash_info.c→lib/crypto/hash_info.c

+0 −0

File moved.