diff --git a/crypto/Kconfig b/crypto/Kconfig index 3ea1397214e0..5d4cf022c577 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -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" diff --git a/crypto/Makefile b/crypto/Makefile index 5098fa6d5f39..816607e0e78c 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -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 diff --git a/lib/crypto/Kconfig b/lib/crypto/Kconfig index 3305c6908581..ee7e1e27ea6a 100644 --- a/lib/crypto/Kconfig +++ b/lib/crypto/Kconfig @@ -2,6 +2,9 @@ menu "Crypto library routines" +config CRYPTO_HASH_INFO + bool + config CRYPTO_LIB_UTILS tristate diff --git a/lib/crypto/Makefile b/lib/crypto/Makefile index a887bf103bf0..533bb1533e19 100644 --- a/lib/crypto/Makefile +++ b/lib/crypto/Makefile @@ -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 diff --git a/crypto/hash_info.c b/lib/crypto/hash_info.c similarity index 100% rename from crypto/hash_info.c rename to lib/crypto/hash_info.c