lib: rsa: distinguish between tpl and spl for CONFIG_RSA_VERIFY
PATCH v3 1/4 lib: rsa: distinguish between tpl and spl for CONFIG_RSA_VERIFY
From: Heiko Stuebner <[email protected]>
While the SPL may want to do signature checking this won't be the case for TPL in all cases, as TPL is mostly used when the amound of initial memory is not enough for a full SPL.
So on a system where SPL uses DM but TPL does not we currently end up with a TPL compile error of:
lib/rsa/rsa-verify.c:48:25: error: dereferencing pointer to incomplete type ?struct checksum_algo?
To prevent that change the $(SPL_) to $(SPL_TPL_) to distinguish between both. If someone really needs FIT signature checking in TPL as well, a new TPL_RSA_VERIFY config symbol needs to be added.
---
changes in v2:
- fix typo "distinguis(h)"
I've split out the build fixes from the signature series. It would be cool to get these applied already, as they do fix actual issues to be seen when enabling signature support in spl.
lib/rsa/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/rsa/Makefile +1 -1
@@ -5,6 +5,6 @@ # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd at denx.de. -obj-$(CONFIG_$(SPL_)RSA_VERIFY) += rsa-verify.o rsa-checksum.o +obj-$(CONFIG_$(SPL_TPL_)RSA_VERIFY) += rsa-verify.o rsa-checksum.o obj-$(CONFIG_RSA_VERIFY_WITH_PKEY) += rsa-keyprop.o obj-$(CONFIG_RSA_SOFTWARE_EXP) += rsa-mod-exp.o
Signature · 1 line
2.25.1
PATCH v3 2/4 lib: rsa: take spl/non-spl into account when building rsa_verify_with_pkey()
From: Heiko Stuebner <[email protected]>
Right now in multiple places there are only checks for the full CONFIG_RSA_VERIFY_WITH_PKEY option, not split into main,spl,tpl variants.
This breaks when the rsa functions get enabled for SPL, for example to verify u-boot proper from spl.
So fix this by using the existing helpers to distinguis between build-steps.
---
changes in v3:
- new patch with another build issue
lib/rsa/Makefile | 2 +- lib/rsa/rsa-verify.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
lib/rsa/Makefile +1 -1
@@ -6,5 +6,5 @@ # Wolfgang Denk, DENX Software Engineering, wd at denx.de. obj-$(CONFIG_$(SPL_TPL_)RSA_VERIFY) += rsa-verify.o rsa-checksum.o -obj-$(CONFIG_RSA_VERIFY_WITH_PKEY) += rsa-keyprop.o +obj-$(CONFIG_$(SPL_TPL_)RSA_VERIFY_WITH_PKEY) += rsa-keyprop.o obj-$(CONFIG_RSA_SOFTWARE_EXP) += rsa-mod-exp.o
lib/rsa/rsa-verify.c +2 -2
@@ -284,7 +284,7 @@ out: }#endif -#if CONFIG_IS_ENABLED (FIT_SIGNATURE ) ||IS_ENABLED (CONFIG_RSA_VERIFY_WITH_PKEY ) +#if CONFIG_IS_ENABLED (FIT_SIGNATURE ) ||CONFIG_IS_ENABLED (RSA_VERIFY_WITH_PKEY )/** * rsa_verify_key() - Verify a signature against some data using RSA Key *
@@ -358,7 +358,7 @@ static int rsa_verify_key(struct image_sign_info *info, }#endif -#ifdef CONFIG_RSA_VERIFY_WITH_PKEY +#if CONFIG_IS_ENABLED (RSA_VERIFY_WITH_PKEY )/** * rsa_verify_with_pkey() - Verify a signature against some data using * only modulus and exponent as RSA key properties.
Signature · 1 line
2.25.1
PATCH 2/4 lib: rsa: take spl/non-spl into account when building rsa_verify_with_pkey()
From: Heiko Stuebner <[email protected]>
Right now in multiple places there are only checks for the full CONFIG_RSA_VERIFY_WITH_PKEY option, not split into main,spl,tpl variants.
This breaks when the rsa functions get enabled for SPL, for example to verify u-boot proper from spl.
So fix this by using the existing helpers to distinguis between build-steps.
---
changes in v3.1:
- drop changeid
changes in v3:
- new patch with another build issue
lib/rsa/Makefile | 2 +- lib/rsa/rsa-verify.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
lib/rsa/Makefile +1 -1
@@ -6,5 +6,5 @@ # Wolfgang Denk, DENX Software Engineering, wd at denx.de. obj-$(CONFIG_$(SPL_TPL_)RSA_VERIFY) += rsa-verify.o rsa-checksum.o -obj-$(CONFIG_RSA_VERIFY_WITH_PKEY) += rsa-keyprop.o +obj-$(CONFIG_$(SPL_TPL_)RSA_VERIFY_WITH_PKEY) += rsa-keyprop.o obj-$(CONFIG_RSA_SOFTWARE_EXP) += rsa-mod-exp.o
lib/rsa/rsa-verify.c +2 -2
@@ -284,7 +284,7 @@ out: }#endif -#if CONFIG_IS_ENABLED (FIT_SIGNATURE ) ||IS_ENABLED (CONFIG_RSA_VERIFY_WITH_PKEY ) +#if CONFIG_IS_ENABLED (FIT_SIGNATURE ) ||CONFIG_IS_ENABLED (RSA_VERIFY_WITH_PKEY )/** * rsa_verify_key() - Verify a signature against some data using RSA Key *
@@ -358,7 +358,7 @@ static int rsa_verify_key(struct image_sign_info *info, }#endif -#ifdef CONFIG_RSA_VERIFY_WITH_PKEY +#if CONFIG_IS_ENABLED (RSA_VERIFY_WITH_PKEY )/** * rsa_verify_with_pkey() - Verify a signature against some data using * only modulus and exponent as RSA key properties.
Signature · 1 line
2.25.1
PATCH v3 3/4 spl: fit: select SPL_HASH_SUPPORT for SPL_FIT_SIGNATURE
In reply to Heiko StuebnerFrom: Heiko Stuebner <[email protected]>
rsa-checksum needs support for hash functions or else will run into compile errors like:u-boot/lib/rsa/rsa-checksum.c:28: undefined reference to `hash_progressive_lookup_algo'
So similar to the main FIT_SIGNATURE entry selects HASH, select SPL_HASH_SUPPORT for SPL_FIT_SIGNATURE.
--- Kconfig | 1 + 1 file changed, 1 insertion(+)
Kconfig +1 -0
@@ -459,6 +459,7 @@ config SPL_FIT_SIGNATURE bool "Enable signature verification of FIT firmware within SPL" depends on SPL_DM select SPL_FIT + select SPL_HASH_SUPPORT select SPL_RSA select SPL_RSA_VERIFY select SPL_IMAGE_SIGN_INFO
Signature · 1 line
2.25.1
PATCH v3 4/4 spl: fit: select SPL_CRYPTO_SUPPORT for SPL_FIT_SIGNATURE
In reply to Heiko StuebnerFrom: Heiko Stuebner <[email protected]>
Verifying FIT images obviously needs the rsa parts of crypto support and while main uboot always compiles crypto support, it's optional for SPL and we should thus select the necessary option to not end up in compile errors like:
u-boot/lib/rsa/rsa-verify.c:328: undefined reference to `rsa_mod_exp'
So select SPL_CRYPTO_SUPPORT in SPL_FIT_SIGNATURE.
--- Kconfig | 1 + 1 file changed, 1 insertion(+)
Kconfig +1 -0
@@ -459,6 +459,7 @@ config SPL_FIT_SIGNATURE bool "Enable signature verification of FIT firmware within SPL" depends on SPL_DM select SPL_FIT + select SPL_CRYPTO_SUPPORT select SPL_HASH_SUPPORT select SPL_RSA select SPL_RSA_VERIFY
Signature · 1 line
2.25.1
PATCH v3 1/4 lib: rsa: distinguish between tpl and spl for CONFIG_RSA_VERIFY
In reply to Heiko StuebnerQuoted 8 lines · Heiko Stuebner
From: Heiko Stuebner <[email protected]>
While the SPL may want to do signature checking this won't be the case for TPL in all cases, as TPL is mostly used when the amound of initial memory is not enough for a full SPL.
nit: amound -> amount
Quoted 40 lines
So on a system where SPL uses DM but TPL does not we currently end up with a TPL compile error of:
lib/rsa/rsa-verify.c:48:25: error: dereferencing pointer to incomplete type ?structchecksum_algo?To prevent that change the $(SPL_) to $(SPL_TPL_) to distinguish between both. If someone really needs FIT signature checking in TPL as well, a new
TPL_RSA_VERIFYconfig symbol needs to be added.Signed-off-by Heiko Stuebner <[email protected]>Reviewed-by Philipp Tomsich <[email protected]>Reviewed-by Kever Yang <[email protected]>---
changes in v2:
- fix typo "distinguis(h)"I've split out the build fixes from the signature series. It would be cool to get these applied already, as they do fix actual issues to be seen when enabling signature support in spl.
lib/rsa/Makefile| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)lib/rsa/Makefile +1
-1@@ -5,6 +5,6 @@ # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd at denx.de. -obj-$(CONFIG_$(SPL_)RSA_VERIFY) += rsa-verify.o rsa-checksum.o +obj-$(CONFIG_$(SPL_TPL_)RSA_VERIFY) += rsa-verify.o rsa-checksum.oobj-$(CONFIG_RSA_VERIFY_WITH_PKEY) += rsa-keyprop.o obj-$(CONFIG_RSA_SOFTWARE_EXP) += rsa-mod-exp.o
Signature · 1 line
2.25.1