crypto: curve25519 - Fix build error when CRYPTO_MANAGER_DISABLE_TESTS!=y && CRYPTO=m
Subsystems (4)
PATCH 1/1 crypto: curve25519 - Fix build error when CRYPTO_MANAGER_DISABLE_TESTS!=y && CRYPTO=m
If CRYPTO_MANAGER_DISABLE_TESTS!=y, CRYPTO=m, bulding fails:
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'
Add depends for CRYPTO_LIB_CURVE25519 to fix this.
--- lib/crypto/Kconfig | 1 + 1 file changed, 1 insertion(+)
lib/crypto/Kconfig +1 -0
@@ -70,6 +70,7 @@ config CRYPTO_LIB_CURVE25519_GENERIC config CRYPTO_LIB_CURVE25519 tristate "Curve25519 scalar multiplication library" depends on CRYPTO_ARCH_HAVE_LIB_CURVE25519 || !CRYPTO_ARCH_HAVE_LIB_CURVE25519 + depends on (CRYPTO && CRYPTO_MANAGER_DISABLE_TESTS!=y) || (CRYPTO_MANAGER_DISABLE_TESTS=y) select CRYPTO_LIB_CURVE25519_GENERIC if CRYPTO_ARCH_HAVE_LIB_CURVE25519=n help Enable the Curve25519 library interface. This interface may be
--
2.31.1
Jason A. Donenfeld
maintainerQuoted 12 lines · Zheng Bin
If CRYPTO_MANAGER_DISABLE_TESTS!=y, CRYPTO=m, bulding fails:
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'
Quoted 1 line
Add depends for
CRYPTO_LIB_CURVE25519to fix this.
In this case, the bug isn't caused by the tests exactly but by the curve25519.h inline usage here:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/include/crypto/curve25519.h#n43
Probably the solution for this one is to move crypto_memneq into lib/crypto.
Jason
Jason A. Donenfeld
maintainerPATCH 1/1 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'
---
I'm traveling over the next week, and there are a few ways to skin this cat, so if somebody here sees issue, feel free to pick this v1 up and fashion a v2 out of it.
crypto/Kconfig | 1 +
crypto/Makefile | 2 +-
lib/Kconfig | 3 +++
lib/Makefile | 1 +
lib/crypto/Kconfig | 1 +
{crypto => lib}/memneq.c | 0
6 files changed, 7 insertions(+), 1 deletion(-)
rename {crypto => lib}/memneq.c (100%)crypto/Kconfig +1 -0
@@ -15,6 +15,7 @@ source "crypto/async_tx/Kconfig" # menuconfig CRYPTO tristate "Cryptographic API" + select LIB_MEMNEQ help This option provides the core Cryptographic API.
crypto/Makefile +1 -1
@@ -4,7 +4,7 @@ # 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_ENGINE) += crypto_engine.o obj-$(CONFIG_CRYPTO_FIPS) += fips.o
lib/Kconfig +3 -0
@@ -120,6 +120,9 @@ config INDIRECT_IOMEM_FALLBACK source "lib/crypto/Kconfig" +config LIB_MEMNEQ + bool + config CRC_CCITT tristate "CRC-CCITT functions" help
lib/Makefile +1 -0
@@ -251,6 +251,7 @@ obj-$(CONFIG_DIMLIB) += dim/ obj-$(CONFIG_SIGNATURE) += digsig.o lib-$(CONFIG_CLZ_TAB) += clz_tab.o +lib-$(CONFIG_LIB_MEMNEQ) += memneq.o obj-$(CONFIG_GENERIC_STRNCPY_FROM_USER) += strncpy_from_user.o obj-$(CONFIG_GENERIC_STRNLEN_USER) += strnlen_user.o
lib/crypto/Kconfig +1 -0
@@ -71,6 +71,7 @@ config CRYPTO_LIB_CURVE25519 tristate "Curve25519 scalar multiplication library" 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 LIB_MEMNEQ help Enable the Curve25519 library interface. This interface may be fulfilled by either the generic implementation or an arch-specific
lib/memneq.c renamed from crypto/memneq.c +0 -0
Signature · 1 line
2.35.1
Re: [PATCH crypto] crypto: memneq - move into lib/
Quoted 23 lines · Jason A. Donenfeld
This is used by code that doesn't need
CONFIG_CRYPTO, so move this intolib/with aKconfigoption 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'Reported-by Zheng Bin <[email protected]>Cc Eric Biggers <[email protected]>Fixes aa127963f1ca ("crypto: lib/curve25519 - re-add selftests")Signed-off-by Jason A. Donenfeld <[email protected]>---
I'm traveling over the next week, and there are a few ways to skin this cat, so if somebody here sees issue, feel free to pick this v1 up and fashion a v2 out of it.
Quoted 8 lines
crypto/Kconfig | 1 +
crypto/Makefile | 2 +-
lib/Kconfig | 3 +++
lib/Makefile | 1 +
lib/crypto/Kconfig | 1 +
{crypto => lib}/memneq.c | 0
6 files changed, 7 insertions(+), 1 deletion(-)
rename {crypto => lib}/memneq.c (100%)- Eric
Herbert Xu
maintainerRe: [PATCH crypto] crypto: memneq - move into lib/
In reply to Jason A. DonenfeldQuoted 23 lines · Jason A. Donenfeld
This is used by code that doesn't need
CONFIG_CRYPTO, so move this intolib/with aKconfigoption 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'Reported-by Zheng Bin <[email protected]>Cc Eric Biggers <[email protected]>Fixes aa127963f1ca ("crypto: lib/curve25519 - re-add selftests")Signed-off-by Jason A. Donenfeld <[email protected]>---
I'm traveling over the next week, and there are a few ways to skin this cat, so if somebody here sees issue, feel free to pick this v1 up and fashion a v2 out of it.
Quoted 8 lines
crypto/Kconfig | 1 +
crypto/Makefile | 2 +-
lib/Kconfig | 3 +++
lib/Makefile | 1 +
lib/crypto/Kconfig | 1 +
{crypto => lib}/memneq.c | 0
6 files changed, 7 insertions(+), 1 deletion(-)
rename {crypto => lib}/memneq.c (100%)Patch applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt