UPSTREAM: crypto: memneq - move into lib/
This is used by code that doesn't need CONFIG_CRYPTO, so move this into lib/ with a Kconfig option so that it can be selected by whatever needs it. This fixes a linker error Zheng pointed out when CRYPTO_MANAGER_DISABLE_TESTS!=y and CRYPTO=m: lib/crypto/curve25519-selftest.o: In function `curve25519_selftest': curve25519-selftest.c:(.init.text+0x60): undefined reference to `__crypto_memneq' curve25519-selftest.c:(.init.text+0xec): undefined reference to `__crypto_memneq' curve25519-selftest.c:(.init.text+0x114): undefined reference to `__crypto_memneq' curve25519-selftest.c:(.init.text+0x154): undefined reference to `__crypto_memneq' Bug: 254441685 Reported-by: Zheng Bin <zhengbin13@huawei.com> Cc: Eric Biggers <ebiggers@kernel.org> Cc: stable@vger.kernel.org Fixes: aa127963f1ca ("crypto: lib/curve25519 - re-add selftests") Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Reviewed-by: Eric Biggers <ebiggers@google.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> (cherry picked from commit 920b0442b9f884f55f4745b53430c80e71e90275) Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: If70cd31f6e09f4312a7c7f815cc93637e00e1fb7
This commit is contained in:
committed by
Lee Jones
parent
7791a8c24e
commit
a2243f0ffd
@@ -15,6 +15,7 @@ source "crypto/async_tx/Kconfig"
|
|||||||
#
|
#
|
||||||
menuconfig CRYPTO
|
menuconfig CRYPTO
|
||||||
tristate "Cryptographic API"
|
tristate "Cryptographic API"
|
||||||
|
select LIB_MEMNEQ
|
||||||
help
|
help
|
||||||
This option provides the core Cryptographic API.
|
This option provides the core Cryptographic API.
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
obj-$(CONFIG_CRYPTO) += crypto.o
|
obj-$(CONFIG_CRYPTO) += crypto.o
|
||||||
crypto-y := api.o cipher.o compress.o memneq.o
|
crypto-y := api.o cipher.o compress.o
|
||||||
|
|
||||||
obj-$(CONFIG_CRYPTO_WORKQUEUE) += crypto_wq.o
|
obj-$(CONFIG_CRYPTO_WORKQUEUE) += crypto_wq.o
|
||||||
|
|
||||||
|
|||||||
@@ -72,6 +72,9 @@ config INDIRECT_PIO
|
|||||||
|
|
||||||
source "lib/crypto/Kconfig"
|
source "lib/crypto/Kconfig"
|
||||||
|
|
||||||
|
config LIB_MEMNEQ
|
||||||
|
bool
|
||||||
|
|
||||||
config CRC_CCITT
|
config CRC_CCITT
|
||||||
tristate "CRC-CCITT functions"
|
tristate "CRC-CCITT functions"
|
||||||
help
|
help
|
||||||
|
|||||||
@@ -201,6 +201,7 @@ obj-$(CONFIG_MPILIB) += mpi/
|
|||||||
obj-$(CONFIG_SIGNATURE) += digsig.o
|
obj-$(CONFIG_SIGNATURE) += digsig.o
|
||||||
|
|
||||||
lib-$(CONFIG_CLZ_TAB) += clz_tab.o
|
lib-$(CONFIG_CLZ_TAB) += clz_tab.o
|
||||||
|
lib-$(CONFIG_LIB_MEMNEQ) += memneq.o
|
||||||
|
|
||||||
obj-$(CONFIG_DDR) += jedec_ddr_data.o
|
obj-$(CONFIG_DDR) += jedec_ddr_data.o
|
||||||
|
|
||||||
|
|||||||
@@ -65,6 +65,7 @@ config CRYPTO_LIB_CURVE25519
|
|||||||
tristate "Curve25519 scalar multiplication library"
|
tristate "Curve25519 scalar multiplication library"
|
||||||
depends on CRYPTO_ARCH_HAVE_LIB_CURVE25519 || !CRYPTO_ARCH_HAVE_LIB_CURVE25519
|
depends on CRYPTO_ARCH_HAVE_LIB_CURVE25519 || !CRYPTO_ARCH_HAVE_LIB_CURVE25519
|
||||||
select CRYPTO_LIB_CURVE25519_GENERIC if CRYPTO_ARCH_HAVE_LIB_CURVE25519=n
|
select CRYPTO_LIB_CURVE25519_GENERIC if CRYPTO_ARCH_HAVE_LIB_CURVE25519=n
|
||||||
|
select LIB_MEMNEQ
|
||||||
help
|
help
|
||||||
Enable the Curve25519 library interface. This interface may be
|
Enable the Curve25519 library interface. This interface may be
|
||||||
fulfilled by either the generic implementation or an arch-specific
|
fulfilled by either the generic implementation or an arch-specific
|
||||||
|
|||||||
Reference in New Issue
Block a user