add software ecdsa support
Subsystems (2)
v4 cover add software ecdsa support
This serie adds the support of ecdsa with software using mbedtls. So boards without ecdsa hardware may also use signature with ecdsa.
To add the support of ecdsa with mbedtls, I have:
- enabled ecdsa in mbedtls
- add a function sw_ecdsa_verify that uses mbedtls
- add a driver sw_ecdsa that call sw_ecdsa_verify
I have tested this code with sandbox, and I have followed those steps:
0) build u-boot using sandbox_defconfig and adding those options:CONFIG_ECDSA_SW=yCONFIG_ECDSA_MBEDTLS=yCONFIG_ECDSA=yCONFIG_ECDSA_VERIFY=y
1) add a signature node to an its file
signature-256 {
algo = "sha256,ecdsa256";
key-name-hint = "private-key-256";
};2) generate an ecdsa key
openssl ecparam -name prime256v1 -genkey -noout -out private-key-256.pem
3) create the itb file./tools/mkimage -f <file.its> -k . -K arch/sandbox/dts/test.dtb <file.itb>
4) launch sandbox u-boot
./u-boot -d arch/sandbox/dts/test.dtb
5) on sandbox u-boot prompt, load the itb and launch bootm on it
=> host load hostfs - 1000000 uboot-ecdsa.itb
4628674 bytes read in 1 ms (4.3 GiB/s)
=> bootm 1000000
...
...
Verifying Hash Integrity ... sha256,ecdsa256:private-key-256+ OK
I have tested with success ecdsa256 and ecdsa384, but there is an issue with secp521r1.
Changes in v2:
- move ECDSA_MBEDTLS to MBEDTLS_LIB_X509
- rename lib/mbedtls/sw_ecdsa.c to lib/mbedtls/ecdsa.c
- enhance dependancies for ECDSA_MBEDTLS
- fix support of ecdsa521/secp521r1
- add vboot test using ecdsa
Changes in v3:
- do not use _MBEDTLS in mbedtls_def_config.h
- check returns and remove mem leak in lib/mbedtls/ecdsa.c
- remove useless field *k in struct ecdsa_test_vector_s
- check returns in test/lib/ecdsa.c
- fix third parameter when calling sha*_csum_wd()
- add support of ecdsa in pre-load header
Changes in v4:
- change some dependencies to enable ecc
- use ECDSA_MBEDTLS to build the ecdsa driver
- support ecdsa521 and secp521r1
- add a test calling ecdsa_verify for the ecdsa class
- merge patch 10 and 11 (support ecdsa pre-load for binman and tests)
- several code cleanup
Philippe Reynes (14):
mbedtls: enable support of ecc
ecdsa: initial support of ecdsa using mbedtls
test: lib: ecdsa: add initial test
drivers: crypto: add software ecdsa support
ecdsa: fix support of secp521r1
test: dm: ecdsa.c: clean this test as software ecdsa is now
implemented
test: py: vboot: prepare integration test for ecdsa
test: vboot: add test for ecdsa
tools: mkimage: pre-load: add support of ecdsa
tools: binman: pre-load: add support of ecdsa
boot: pre-load: add support of ecdsa
tools: preload_check_sign: add support of ecdsa
test: py: vboot: prepare test for global signature with ecdsa
test: py: vboot: add test for global signature with ecdsa
boot/image-pre-load.c | 56 ++-
configs/sandbox_defconfig | 1 +
drivers/crypto/Makefile | 1 +
drivers/crypto/ecdsa/Makefile | 6 +
drivers/crypto/ecdsa/ecdsa-sw.c | 33 ++
include/crypto/ecdsa-uclass.h | 15 +-
include/crypto/internal/ecdsa.h | 28 ++
include/u-boot/sha256.h | 2 +
include/u-boot/sha512.h | 3 +
lib/ecdsa/Kconfig | 1 +
lib/ecdsa/ecdsa-libcrypto.c | 83 +++-
lib/ecdsa/ecdsa-verify.c | 64 ++-
lib/fdt-libcrypto.c | 2 +-
lib/mbedtls/Kconfig | 14 +
lib/mbedtls/Makefile | 20 +-
lib/mbedtls/ecdsa.c | 146 ++++++
lib/mbedtls/mbedtls_def_config.h | 17 +
test/dm/ecdsa.c | 104 +++-
test/lib/Makefile | 1 +
test/lib/ecdsa.c | 453 ++++++++++++++++++
test/py/tests/test_fit_ecdsa.py | 2 +-
test/py/tests/test_vboot.py | 143 +++---
.../tests/vboot/sandbox-binman-ecdsa256.dts | 24 +
.../tests/vboot/sandbox-binman-ecdsa384.dts | 24 +
.../tests/vboot/sandbox-binman-ecdsa521.dts | 24 +
...pss.dts => sandbox-binman-rsa2048-pss.dts} | 0
...-binman.dts => sandbox-binman-rsa2048.dts} | 0
.../vboot/sandbox-u-boot-global-ecdsa256.dts | 27 ++
.../vboot/sandbox-u-boot-global-ecdsa384.dts | 27 ++
.../vboot/sandbox-u-boot-global-ecdsa521.dts | 27 ++
... => sandbox-u-boot-global-rsa2048-pss.dts} | 0
....dts => sandbox-u-boot-global-rsa2048.dts} | 0
....its => sign-configs-sha1-rsa2048-pss.its} | 0
...sha1.its => sign-configs-sha1-rsa2048.its} | 0
.../vboot/sign-configs-sha256-ecdsa256.its | 45 ++
.../vboot/sign-configs-sha256-ecdsa384.its | 45 ++
.../vboot/sign-configs-sha256-ecdsa521.its | 45 ++
... sign-configs-sha256-rsa2048-pss-prod.its} | 0
...ts => sign-configs-sha256-rsa2048-pss.its} | 0
...56.its => sign-configs-sha256-rsa2048.its} | 0
...84.its => sign-configs-sha384-rsa3072.its} | 0
...s.its => sign-images-sha1-rsa2048-pss.its} | 0
...-sha1.its => sign-images-sha1-rsa2048.its} | 0
.../vboot/sign-images-sha256-ecdsa256.its | 42 ++
.../vboot/sign-images-sha256-ecdsa384.its | 42 ++
.../vboot/sign-images-sha256-ecdsa521.its | 42 ++
...its => sign-images-sha256-rsa2048-pss.its} | 0
...256.its => sign-images-sha256-rsa2048.its} | 0
...384.its => sign-images-sha384-rsa3072.its} | 0
tools/binman/etype/pre_load.py | 76 ++-
tools/binman/ftest.py | 50 ++
tools/binman/test/ecdsa521.pem | 7 +
tools/binman/test/security/pre_load_ecdsa.dts | 22 +
.../security/pre_load_ecdsa_invalid_algo.dts | 22 +
.../security/pre_load_ecdsa_invalid_key.dts | 22 +
.../security/pre_load_ecdsa_invalid_sha.dts | 22 +
tools/image-host.c | 79 ++-
tools/image-sig-host.c | 7 +
tools/preload_check_sign.c | 29 ++
59 files changed, 1810 insertions(+), 135 deletions(-)
create mode 100644 drivers/crypto/ecdsa/Makefile
create mode 100644 drivers/crypto/ecdsa/ecdsa-sw.c
create mode 100644 include/crypto/internal/ecdsa.h
create mode 100644 lib/mbedtls/ecdsa.c
create mode 100644 test/lib/ecdsa.c
create mode 100644 test/py/tests/vboot/sandbox-binman-ecdsa256.dts
create mode 100644 test/py/tests/vboot/sandbox-binman-ecdsa384.dts
create mode 100644 test/py/tests/vboot/sandbox-binman-ecdsa521.dts
rename test/py/tests/vboot/{sandbox-binman-pss.dts => sandbox-binman-rsa2048-pss.dts} (100%)
rename test/py/tests/vboot/{sandbox-binman.dts => sandbox-binman-rsa2048.dts} (100%)
create mode 100644 test/py/tests/vboot/sandbox-u-boot-global-ecdsa256.dts
create mode 100644 test/py/tests/vboot/sandbox-u-boot-global-ecdsa384.dts
create mode 100644 test/py/tests/vboot/sandbox-u-boot-global-ecdsa521.dts
rename test/py/tests/vboot/{sandbox-u-boot-global-pss.dts => sandbox-u-boot-global-rsa2048-pss.dts} (100%)
rename test/py/tests/vboot/{sandbox-u-boot-global.dts => sandbox-u-boot-global-rsa2048.dts} (100%)
rename test/py/tests/vboot/{sign-configs-sha1-pss.its => sign-configs-sha1-rsa2048-pss.its} (100%)
rename test/py/tests/vboot/{sign-configs-sha1.its => sign-configs-sha1-rsa2048.its} (100%)
create mode 100644 test/py/tests/vboot/sign-configs-sha256-ecdsa256.its
create mode 100644 test/py/tests/vboot/sign-configs-sha256-ecdsa384.its
create mode 100644 test/py/tests/vboot/sign-configs-sha256-ecdsa521.its
rename test/py/tests/vboot/{sign-configs-sha256-pss-prod.its => sign-configs-sha256-rsa2048-pss-prod.its} (100%)
rename test/py/tests/vboot/{sign-configs-sha256-pss.its => sign-configs-sha256-rsa2048-pss.its} (100%)
rename test/py/tests/vboot/{sign-configs-sha256.its => sign-configs-sha256-rsa2048.its} (100%)
rename test/py/tests/vboot/{sign-configs-sha384.its => sign-configs-sha384-rsa3072.its} (100%)
rename test/py/tests/vboot/{sign-images-sha1-pss.its => sign-images-sha1-rsa2048-pss.its} (100%)
rename test/py/tests/vboot/{sign-images-sha1.its => sign-images-sha1-rsa2048.its} (100%)
create mode 100644 test/py/tests/vboot/sign-images-sha256-ecdsa256.its
create mode 100644 test/py/tests/vboot/sign-images-sha256-ecdsa384.its
create mode 100644 test/py/tests/vboot/sign-images-sha256-ecdsa521.its
rename test/py/tests/vboot/{sign-images-sha256-pss.its => sign-images-sha256-rsa2048-pss.its} (100%)
rename test/py/tests/vboot/{sign-images-sha256.its => sign-images-sha256-rsa2048.its} (100%)
rename test/py/tests/vboot/{sign-images-sha384.its => sign-images-sha384-rsa3072.its} (100%)
create mode 100644 tools/binman/test/ecdsa521.pem
create mode 100644 tools/binman/test/security/pre_load_ecdsa.dts
create mode 100644 tools/binman/test/security/pre_load_ecdsa_invalid_algo.dts
create mode 100644 tools/binman/test/security/pre_load_ecdsa_invalid_key.dts
create mode 100644 tools/binman/test/security/pre_load_ecdsa_invalid_sha.dtsSignature · 1 line
2.43.0
PATCH v4 1/14 mbedtls: enable support of ecc
Enables the support of ecc in mbedtls.
---
v2:
- move ecdsa to MBEDTLS_LIB_X509
- enhance depencendies
v3:
- do not use _MBEDTLS in mbedtls_def_config.h
v4:
- do not select ECDSA on some configs
- remove duplicated MBEDTLS_ECP_DP_SECP256K1_ENABLED
- change dependencies for ECDSA configs
configs/sandbox_defconfig | 1 + lib/ecdsa/Kconfig | 1 + lib/mbedtls/Kconfig | 14 ++++++++++++++ lib/mbedtls/Makefile | 17 +++++++++-------- lib/mbedtls/mbedtls_def_config.h | 17 +++++++++++++++++ 5 files changed, 42 insertions(+), 8 deletions(-)
configs/sandbox_defconfig +1 -0
@@ -391,6 +391,7 @@ CONFIG_PANIC_HANG=y CONFIG_CMD_DHRYSTONE=y CONFIG_MBEDTLS_LIB=y CONFIG_HKDF_MBEDTLS=y +CONFIG_ECDSA_MBEDTLS=y CONFIG_ECDSA=y CONFIG_ECDSA_VERIFY=y CONFIG_RSASSA_PSS=y
lib/ecdsa/Kconfig +1 -0
@@ -1,6 +1,7 @@ config ECDSA bool "Enable ECDSA support" depends on DM + select ASN1_DECODER help This enables the ECDSA (elliptic curve signature) algorithm for FIT image verification in U-Boot. The ECDSA algorithm is implemented
lib/mbedtls/Kconfig +14 -0
@@ -247,6 +247,10 @@ config MBEDTLS_LIB_X509 if MBEDTLS_LIB_X509 +config BIGNUM_MBEDTLS + bool + default n + config ASN1_DECODER_MBEDTLS bool "ASN1 decoder with MbedTLS certificate library" depends on MBEDTLS_LIB_X509 && ASN1_DECODER
@@ -264,6 +268,7 @@ config RSA_PUBLIC_KEY_PARSER_MBEDTLS bool "RSA public key parser with MbedTLS certificate library" depends on ASYMMETRIC_PUBLIC_KEY_MBEDTLS select ASN1_DECODER_MBEDTLS + select BIGNUM_MBEDTLS help This option chooses MbedTLS certificate library for RSA public key parser.
@@ -292,6 +297,15 @@ config MSCODE_PARSER_MBEDTLS This option chooses MbedTLS certificate library for MS authenticode parser. +config ECDSA_MBEDTLS + bool "Enable ECDSA support with MbedTLS certificate library" + depends on MBEDTLS_LIB_X509 && ECDSA_VERIFY + select ASN1_DECODER_MBEDTLS + select BIGNUM_MBEDTLS + help + This option enables support of ECDSA with the MbedTLS certificate + library. + endif # MBEDTLS_LIB_X509 config MBEDTLS_LIB_TLS
lib/mbedtls/Makefile +9 -8
@@ -38,14 +38,20 @@ mbedtls_lib_crypto-$(CONFIG_$(PHASE_)HKDF_MBEDTLS) += \ # MbedTLS X509 library obj-$(CONFIG_$(XPL_)MBEDTLS_LIB_X509) += mbedtls_lib_x509.o -mbedtls_lib_x509-y := $(MBEDTLS_LIB_DIR)/x509.o +mbedtls_lib_x509-y := $(MBEDTLS_LIB_DIR)/x509.o \ + $(MBEDTLS_LIB_DIR)/ecdsa.o \ + $(MBEDTLS_LIB_DIR)/ecp.o \ + $(MBEDTLS_LIB_DIR)/ecp_curves.o \ + $(MBEDTLS_LIB_DIR)/ecp_curves_new.o \ + $(MBEDTLS_LIB_DIR)/pk_ecc.o +mbedtls_lib_x509-$(CONFIG_$(PHASE_)BIGNUM_MBEDTLS) += \ + $(MBEDTLS_LIB_DIR)/bignum.o \ + $(MBEDTLS_LIB_DIR)/bignum_core.o mbedtls_lib_x509-$(CONFIG_$(PHASE_)ASN1_DECODER_MBEDTLS) += \ $(MBEDTLS_LIB_DIR)/asn1parse.o \ $(MBEDTLS_LIB_DIR)/asn1write.o \ $(MBEDTLS_LIB_DIR)/oid.o mbedtls_lib_x509-$(CONFIG_$(PHASE_)RSA_PUBLIC_KEY_PARSER_MBEDTLS) += \ - $(MBEDTLS_LIB_DIR)/bignum.o \ - $(MBEDTLS_LIB_DIR)/bignum_core.o \ $(MBEDTLS_LIB_DIR)/rsa.o \ $(MBEDTLS_LIB_DIR)/rsa_alt_helpers.o mbedtls_lib_x509-$(CONFIG_$(PHASE_)ASYMMETRIC_PUBLIC_KEY_MBEDTLS) += \
@@ -64,7 +70,6 @@ mbedtls_lib_tls-y := \ $(MBEDTLS_LIB_DIR)/mps_reader.o \ $(MBEDTLS_LIB_DIR)/mps_trace.o \ $(MBEDTLS_LIB_DIR)/net_sockets.o \ - $(MBEDTLS_LIB_DIR)/pk_ecc.o \ $(MBEDTLS_LIB_DIR)/ssl_cache.o \ $(MBEDTLS_LIB_DIR)/ssl_ciphersuites.o \ $(MBEDTLS_LIB_DIR)/ssl_client.o \
@@ -82,8 +87,4 @@ mbedtls_lib_tls-y := \ $(MBEDTLS_LIB_DIR)/cipher.o \ $(MBEDTLS_LIB_DIR)/cipher_wrap.o \ $(MBEDTLS_LIB_DIR)/ecdh.o \ - $(MBEDTLS_LIB_DIR)/ecdsa.o \ - $(MBEDTLS_LIB_DIR)/ecp.o \ - $(MBEDTLS_LIB_DIR)/ecp_curves.o \ - $(MBEDTLS_LIB_DIR)/ecp_curves_new.o \ $(MBEDTLS_LIB_DIR)/gcm.o \
lib/mbedtls/mbedtls_def_config.h +17 -0
@@ -89,6 +89,23 @@#define MBEDTLS_ASN1_WRITE_C #endif +#if CONFIG_IS_ENABLED (ECDSA ) +#define MBEDTLS_ECDSA_C +#define MBEDTLS_ECP_C +#define MBEDTLS_BIGNUM_C +#define MBEDTLS_ECP_DP_SECP192R1_ENABLED +#define MBEDTLS_ECP_DP_SECP224R1_ENABLED +#define MBEDTLS_ECP_DP_SECP256R1_ENABLED +#define MBEDTLS_ECP_DP_SECP384R1_ENABLED +#define MBEDTLS_ECP_DP_SECP521R1_ENABLED +#define MBEDTLS_ECP_DP_SECP192K1_ENABLED +#define MBEDTLS_ECP_DP_SECP224K1_ENABLED +#define MBEDTLS_ECP_DP_SECP256K1_ENABLED +#define MBEDTLS_ECP_DP_BP256R1_ENABLED +#define MBEDTLS_ECP_DP_BP384R1_ENABLED +#define MBEDTLS_ECP_DP_BP512R1_ENABLED +#endif +#endif /* #if CONFIG_IS_ENABLED(MBEDTLS_LIB_X509) */ #if CONFIG_IS_ENABLED (MBEDTLS_LIB_TLS )
Signature · 1 line
2.43.0
Re: [PATCH v4 01/14] mbedtls: enable support of ecc
Hi Philippe,
Quoted 15 lines · Philippe Reynes
mbedtls: enable support of ecc
Enables the support of ecc in mbedtls.
Signed-off-by Philippe Reynes <[email protected]>configs/sandbox_defconfig | 1 +
lib/ecdsa/Kconfig | 1 + lib/mbedtls/Kconfig | 14 ++++++++++++++ lib/mbedtls/Makefile | 17 +++++++++-------- lib/mbedtls/mbedtls_def_config.h | 17 +++++++++++++++++ 5 files changed, 42 insertions(+), 8 deletions(-)
lib/mbedtls/Makefile mbedtls_lib_crypto-$(CONFIG_$(PHASE_)HKDF_MBEDTLS) += \ · line 43
Quoted 6 lines
lib/mbedtls/Makefile +6
-0@@ -38,14 +38,20 @@ mbedtls_lib_crypto-$(CONFIG_$(PHASE_)HKDF_MBEDTLS) += \ +mbedtls_lib_x509-y := $(MBEDTLS_LIB_DIR)/x509.o \ + $(MBEDTLS_LIB_DIR)/ecdsa.o \ + $(MBEDTLS_LIB_DIR)/ecp.o \ + $(MBEDTLS_LIB_DIR)/ecp_curves.o \ + $(MBEDTLS_LIB_DIR)/ecp_curves_new.o \ + $(MBEDTLS_LIB_DIR)/pk_ecc.o
The ECC objects are unconditionally included in mbedtls_lib_x509-y, increasing binary size for configurations needing X509 without ECDSA. Please can you make these conditional on CONFIG_ECDSA_MBEDTLS, following the RSA_PUBLIC_KEY_PARSER_MBEDTLS pattern?
Quoted 8 lines
lib/mbedtls/mbedtls_def_config.h +6
-0@@ -89,6 +89,23 @@ +#if CONFIG_IS_ENABLED (ECDSA ) +#define MBEDTLS_ECDSA_C +#define MBEDTLS_ECP_C +#define MBEDTLS_BIGNUM_C +#define MBEDTLS_ECP_DP_SECP192R1_ENABLED +#define MBEDTLS_ECP_DP_SECP224R1_ENABLED
lib/mbedtls/mbedtls_def_config.h line 104
Quoted 10 lines
lib/mbedtls/mbedtls_def_config.h +10
-0+#define MBEDTLS_ECP_DP_SECP256R1_ENABLED +#define MBEDTLS_ECP_DP_SECP384R1_ENABLED +#define MBEDTLS_ECP_DP_SECP521R1_ENABLED +#define MBEDTLS_ECP_DP_SECP192K1_ENABLED +#define MBEDTLS_ECP_DP_SECP224K1_ENABLED +#define MBEDTLS_ECP_DP_SECP256K1_ENABLED +#define MBEDTLS_ECP_DP_BP256R1_ENABLED +#define MBEDTLS_ECP_DP_BP384R1_ENABLED +#define MBEDTLS_ECP_DP_BP512R1_ENABLED +#endif
I suspect this should use CONFIG_IS_ENABLED(ECDSA_MBEDTLS) rather than CONFIG_IS_ENABLED(ECDSA), for consistency with other mbedtls-specific features in this file. Currently, enabling ECDSA with the legacy crypto library would set these defines but not link the corresponding code.
lib/mbedtls/Kconfig config MBEDTLS_LIB_X509 · line 249
Quoted 5 lines
lib/mbedtls/Kconfig +3
-0@@ -247,6 +247,10 @@ config MBEDTLS_LIB_X509 +config BIGNUM_MBEDTLS + bool + default n
You don't need 'default n' as 'n' is the default.
Regards,
Simon
Re: [PATCH v4 01/14] mbedtls: enable support of ecc
In reply to Philippe ReynesHi Philippe,
Quoted 71 lines · Philippe Reynes
Enables the support of ecc in mbedtls.
Signed-off-by Philippe Reynes <[email protected]>---
v2:
- move ecdsa toMBEDTLS_LIB_X509
- enhance depencendies
v3:
- do not use_MBEDTLSinmbedtls_def_config.hv4:
- do not select ECDSA on some configs
- remove duplicatedMBEDTLS_ECP_DP_SECP256K1_ENABLED
- change dependencies for ECDSA configsconfigs/sandbox_defconfig | 1 + lib/ecdsa/Kconfig | 1 + lib/mbedtls/Kconfig | 14 ++++++++++++++ lib/mbedtls/Makefile | 17 +++++++++-------- lib/mbedtls/mbedtls_def_config.h | 17 +++++++++++++++++ 5 files changed, 42 insertions(+), 8 deletions(-)configs/sandbox_defconfig +1
-0@@ -391,6 +391,7 @@ CONFIG_PANIC_HANG=y CONFIG_CMD_DHRYSTONE=y CONFIG_MBEDTLS_LIB=y CONFIG_HKDF_MBEDTLS=y +CONFIG_ECDSA_MBEDTLS=y CONFIG_ECDSA=y CONFIG_ECDSA_VERIFY=y CONFIG_RSASSA_PSS=ylib/ecdsa/Kconfig +1
-0@@ -1,6 +1,7 @@ config ECDSA bool "Enable ECDSA support" depends on DM + select ASN1_DECODER help This enables the ECDSA (elliptic curve signature) algorithm for FIT image verification in U-Boot. The ECDSA algorithm is implementedlib/mbedtls/Kconfig +5
-0@@ -247,6 +247,10 @@ config MBEDTLS_LIB_X509 if MBEDTLS_LIB_X509 +config BIGNUM_MBEDTLS + bool + default n + config ASN1_DECODER_MBEDTLS bool "ASN1 decoder with MbedTLS certificate library" depends on MBEDTLS_LIB_X509 && ASN1_DECODER@@ -264,6 +268,7 @@ config RSA_PUBLIC_KEY_PARSER_MBEDTLS bool "RSA public key parser with MbedTLS certificate library" depends on ASYMMETRIC_PUBLIC_KEY_MBEDTLS select ASN1_DECODER_MBEDTLS + select BIGNUM_MBEDTLS help This option chooses MbedTLS certificate library for RSA public key parser.
lib/mbedtls/Kconfig config MSCODE_PARSER_MBEDTLS · line 303
Quoted 7 lines
lib/mbedtls/Kconfig +4
-0@@ -292,6 +297,15 @@ config MSCODE_PARSER_MBEDTLS This option chooses MbedTLS certificate library for MS authenticode parser. +config ECDSA_MBEDTLS + bool "Enable ECDSA support with MbedTLS certificate library" + depends on MBEDTLS_LIB_X509 && ECDSA_VERIFY + select ASN1_DECODER_MBEDTLS
select ASN1_DECODER_MBEDTLS if ASN1_DECODER
All _MBEDTLS switches should be under control of the main switches.
Quoted 13 lines
lib/mbedtls/Kconfig +5
-0+ select BIGNUM_MBEDTLS + help + This option enables support of ECDSA with the MbedTLS certificate + library. + endif # MBEDTLS_LIB_X509 config MBEDTLS_LIB_TLSlib/mbedtls/Makefile +0
-0
lib/mbedtls/Makefile mbedtls_lib_crypto-$(CONFIG_$(PHASE_)HKDF_MBEDTLS) += \ · line 46
Quoted 10 lines
lib/mbedtls/Makefile +6
-1@@ -38,14 +38,20 @@ mbedtls_lib_crypto-$(CONFIG_$(PHASE_)HKDF_MBEDTLS) += \ # MbedTLS X509 library obj-$(CONFIG_$(XPL_)MBEDTLS_LIB_X509) += mbedtls_lib_x509.o -mbedtls_lib_x509-y := $(MBEDTLS_LIB_DIR)/x509.o +mbedtls_lib_x509-y := $(MBEDTLS_LIB_DIR)/x509.o \ + $(MBEDTLS_LIB_DIR)/ecdsa.o \ + $(MBEDTLS_LIB_DIR)/ecp.o \ + $(MBEDTLS_LIB_DIR)/ecp_curves.o \ + $(MBEDTLS_LIB_DIR)/ecp_curves_new.o \ + $(MBEDTLS_LIB_DIR)/pk_ecc.o
To avoid increasing binary size and making the build dependency broader than the feature being enabled, please use 'mbedtls_lib_x509-$(CONFIG_$(PHASE_)ECDSA_MBEDTLS)' instead of 'mbedtls_lib_x509-y' when introducing the ecdsa/ecp/ecc objects.
Regards,
Raymond
Quoted 61 lines
lib/mbedtls/Makefile +3
-7+mbedtls_lib_x509-$(CONFIG_$(PHASE_)BIGNUM_MBEDTLS) += \ + $(MBEDTLS_LIB_DIR)/bignum.o \ + $(MBEDTLS_LIB_DIR)/bignum_core.o mbedtls_lib_x509-$(CONFIG_$(PHASE_)ASN1_DECODER_MBEDTLS) += \ $(MBEDTLS_LIB_DIR)/asn1parse.o \ $(MBEDTLS_LIB_DIR)/asn1write.o \ $(MBEDTLS_LIB_DIR)/oid.o mbedtls_lib_x509-$(CONFIG_$(PHASE_)RSA_PUBLIC_KEY_PARSER_MBEDTLS) += \ - $(MBEDTLS_LIB_DIR)/bignum.o \ - $(MBEDTLS_LIB_DIR)/bignum_core.o \ $(MBEDTLS_LIB_DIR)/rsa.o \ $(MBEDTLS_LIB_DIR)/rsa_alt_helpers.o mbedtls_lib_x509-$(CONFIG_$(PHASE_)ASYMMETRIC_PUBLIC_KEY_MBEDTLS) += \@@ -64,7 +70,6 @@ mbedtls_lib_tls-y := \ $(MBEDTLS_LIB_DIR)/mps_reader.o \ $(MBEDTLS_LIB_DIR)/mps_trace.o \ $(MBEDTLS_LIB_DIR)/net_sockets.o \ - $(MBEDTLS_LIB_DIR)/pk_ecc.o \ $(MBEDTLS_LIB_DIR)/ssl_cache.o \ $(MBEDTLS_LIB_DIR)/ssl_ciphersuites.o \ $(MBEDTLS_LIB_DIR)/ssl_client.o \@@ -82,8 +87,4 @@ mbedtls_lib_tls-y := \ $(MBEDTLS_LIB_DIR)/cipher.o \ $(MBEDTLS_LIB_DIR)/cipher_wrap.o \ $(MBEDTLS_LIB_DIR)/ecdh.o \ - $(MBEDTLS_LIB_DIR)/ecdsa.o \ - $(MBEDTLS_LIB_DIR)/ecp.o \ - $(MBEDTLS_LIB_DIR)/ecp_curves.o \ - $(MBEDTLS_LIB_DIR)/ecp_curves_new.o \ $(MBEDTLS_LIB_DIR)/gcm.o \lib/mbedtls/mbedtls_def_config.h +17
-1@@ -89,6 +89,23 @@#define MBEDTLS_ASN1_WRITE_C #endif +#if CONFIG_IS_ENABLED (ECDSA ) +#define MBEDTLS_ECDSA_C +#define MBEDTLS_ECP_C +#define MBEDTLS_BIGNUM_C +#define MBEDTLS_ECP_DP_SECP192R1_ENABLED +#define MBEDTLS_ECP_DP_SECP224R1_ENABLED +#define MBEDTLS_ECP_DP_SECP256R1_ENABLED +#define MBEDTLS_ECP_DP_SECP384R1_ENABLED +#define MBEDTLS_ECP_DP_SECP521R1_ENABLED +#define MBEDTLS_ECP_DP_SECP192K1_ENABLED +#define MBEDTLS_ECP_DP_SECP224K1_ENABLED +#define MBEDTLS_ECP_DP_SECP256K1_ENABLED +#define MBEDTLS_ECP_DP_BP256R1_ENABLED +#define MBEDTLS_ECP_DP_BP384R1_ENABLED +#define MBEDTLS_ECP_DP_BP512R1_ENABLED +#endif +#endif /* #if CONFIG_IS_ENABLED(MBEDTLS_LIB_X509) */ #if CONFIG_IS_ENABLED (MBEDTLS_LIB_TLS ) --2.43.0
PATCH v4 2/14 ecdsa: initial support of ecdsa using mbedtls
In reply to Philippe ReynesAdds an initial support of ecdsa verify using mbedtls.
---
v2:
- rename sw_ecdsa.c to ecdsa.c
v3:
- rename sw_ecdsa_verify to ecdsa_hash_verify
- stop on first group found
- check signature len
- use debug instead of printf
- check function returns
- fix memleaks in ecdsa_hash_verify
v4:
- move struct ecdsa_public_key from ecdsa-u-class.h to internal/ecdsa.h
- use DIV_ROUND_UP
- some code cleanup
include/crypto/ecdsa-uclass.h | 15 +--- include/crypto/internal/ecdsa.h | 28 ++++++ lib/mbedtls/Makefile | 3 + lib/mbedtls/ecdsa.c | 146 ++++++++++++++++++++++++++++++++ 4 files changed, 178 insertions(+), 14 deletions(-) create mode 100644 include/crypto/internal/ecdsa.h create mode 100644 lib/mbedtls/ecdsa.c
include/crypto/ecdsa-uclass.h +1 -14
@@ -4,20 +4,7 @@*/ #include <dm/device.h> - -/** -* struct ecdsa_public_key - ECDSA public key properties -* -* The struct has pointers to the (x, y) curve coordinates to an ECDSA public -* key, as well as the name of the ECDSA curve. The size of the key is inferred -* from the 'curve_name' -*/ -struct ecdsa_public_key { -const char *curve_name;/* Name of curve, e.g. "prime256v1" */ -const void *x;/* x coordinate of public key */ -const void *y;/* y coordinate of public key */ -unsigned int size_bits;/* key size in bits, derived from curve name */ -}; +#include <crypto/internal/ecdsa.h> struct ecdsa_ops {/**
include/crypto/internal/ecdsa.h new file +28 -0
@@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright (c) 2026, Philippe Reynes <[email protected]> +*/ +#ifndef _ECDSA_HELPER_ +#define _ECDSA_HELPER_ + +#include <linux/types.h> + +/** +* struct ecdsa_public_key - ECDSA public key properties +* +* The struct has pointers to the (x, y) curve coordinates to an ECDSA public +* key, as well as the name of the ECDSA curve. The size of the key is inferred +* from the 'curve_name' +*/ +struct ecdsa_public_key { +const char *curve_name;/* Name of curve, e.g. "prime256v1" */ +const void *x;/* x coordinate of public key */ +const void *y;/* y coordinate of public key */ +unsigned int size_bits;/* key size in bits, derived from curve name */ +}; + +int ecdsa_hash_verify (const struct ecdsa_public_key *pubkey, +const void *hash,size_t hash_len, +const void *signature,size_t sig_len); + +#endif
lib/mbedtls/Makefile +3 -0
@@ -11,6 +11,9 @@ obj-$(CONFIG_$(PHASE_)SHA1_MBEDTLS) += sha1.o obj-$(CONFIG_$(PHASE_)SHA256_MBEDTLS) += sha256.o obj-$(CONFIG_$(PHASE_)SHA512_MBEDTLS) += sha512.o +# shim layer for ecdsa +obj-$(CONFIG_$(PHASE_)ECDSA_MBEDTLS) += ecdsa.o + # x509 libraries obj-$(CONFIG_$(PHASE_)ASYMMETRIC_PUBLIC_KEY_MBEDTLS) += \ public_key.o
lib/mbedtls/ecdsa.c new file +146 -0
146 lines not on this page · raw message
Signature · 1 line
2.43.0
Re: [PATCH v4 02/14] ecdsa: initial support of ecdsa using mbedtls
Hi Philippe,
Quoted 18 lines · Philippe Reynes
ecdsa: initial support of ecdsa using mbedtls
Adds an initial support of ecdsa verify using mbedtls.
Signed-off-by Philippe Reynes <[email protected]>
include/crypto/ecdsa-uclass.h| 15 +----include/crypto/internal/ecdsa.h | 28 ++++++++ lib/mbedtls/Makefile | 3 + lib/mbedtls/ecdsa.c | 146 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 178 insertions(+), 14 deletions(-)lib/mbedtls/ecdsa.c +4
-0@@ -0,0 +1,146 @@ + err =mbedtls_mpi_read_binary (&Q .Y, pubkey->y, key_len); +if (err) { +log_debug ("could not read value y of the public key (err = %d)\n" , + err);
lib/mbedtls/ecdsa.c line 14
Quoted 10 lines
lib/mbedtls/ecdsa.c +10
-0+ err = -EINVAL ; + goto out2; + } +mbedtls_mpi_lset (&Q .Z,1 ); +if (err) { +log_debug ("could not set value z of the public key (err = %d)\n" , + err); + err = -EINVAL ; + goto out2; + }
Shouldn't this be:
err = mbedtls_mpi_lset(&Q.Z, 1);
if (err) {include/crypto/internal/ecdsa.h line 3
Quoted 5 lines
include/crypto/internal/ecdsa.h +3
-0@@ -0,0 +1,28 @@ +int ecdsa_hash_verify (const struct ecdsa_public_key *pubkey, +const void *hash,size_t hash_len, +const void *signature,size_t sig_len);
Please can you add a kerneldoc comment documenting the parameters and return value?
Regards,
Simon
Re: [PATCH v4 02/14] ecdsa: initial support of ecdsa using mbedtls
In reply to Philippe ReynesHi Philippe,
Quoted 191 lines · Philippe Reynes
Adds an initial support of ecdsa verify using mbedtls.
Signed-off-by Philippe Reynes <[email protected]>---
v2:
- renamesw_ecdsa.ctoecdsa.c
v3:
- renamesw_ecdsa_verifytoecdsa_hash_verify
- stop on first group found
- check signature len
- use debug instead of printf
- check function returns
- fix memleaks inecdsa_hash_verify
v4:
- move structecdsa_public_keyfromecdsa-u-class.htointernal/ecdsa.h
- useDIV_ROUND_UP
- some code cleanupinclude/crypto/ecdsa-uclass.h | 15 +--- include/crypto/internal/ecdsa.h | 28 ++++++ lib/mbedtls/Makefile | 3 + lib/mbedtls/ecdsa.c | 146 ++++++++++++++++++++++++++++++++ 4 files changed, 178 insertions(+), 14 deletions(-) create mode 100644 include/crypto/internal/ecdsa.h create mode 100644 lib/mbedtls/ecdsa.cinclude/crypto/ecdsa-uclass.h +1
-14@@ -4,20 +4,7 @@*/ #include <dm/device.h> - -/** -* struct ecdsa_public_key - ECDSA public key properties -* -* The struct has pointers to the (x, y) curve coordinates to an ECDSA public -* key, as well as the name of the ECDSA curve. The size of the key is inferred -* from the 'curve_name' -*/ -struct ecdsa_public_key { -const char *curve_name;/* Name of curve, e.g. "prime256v1" */ -const void *x;/* x coordinate of public key */ -const void *y;/* y coordinate of public key */ -unsigned int size_bits;/* key size in bits, derived from curve name */ -}; +#include <crypto/internal/ecdsa.h> struct ecdsa_ops {/** include/crypto/internal/ecdsa.h new file +28
-0@@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* +* Copyright (c) 2026, Philippe Reynes <[email protected]> +*/ +#ifndef _ECDSA_HELPER_ +#define _ECDSA_HELPER_ + +#include <linux/types.h> + +/** +* struct ecdsa_public_key - ECDSA public key properties +* +* The struct has pointers to the (x, y) curve coordinates to an ECDSA public +* key, as well as the name of the ECDSA curve. The size of the key is inferred +* from the 'curve_name' +*/ +struct ecdsa_public_key { +const char *curve_name;/* Name of curve, e.g. "prime256v1" */ +const void *x;/* x coordinate of public key */ +const void *y;/* y coordinate of public key */ +unsigned int size_bits;/* key size in bits, derived from curve name */ +}; + +int ecdsa_hash_verify (const struct ecdsa_public_key *pubkey, +const void *hash,size_t hash_len, +const void *signature,size_t sig_len); + +#endif lib/mbedtls/Makefile +3
-0@@ -11,6 +11,9 @@ obj-$(CONFIG_$(PHASE_)SHA1_MBEDTLS) += sha1.o obj-$(CONFIG_$(PHASE_)SHA256_MBEDTLS) += sha256.o obj-$(CONFIG_$(PHASE_)SHA512_MBEDTLS) += sha512.o +# shim layer for ecdsa +obj-$(CONFIG_$(PHASE_)ECDSA_MBEDTLS) += ecdsa.o + # x509 libraries obj-$(CONFIG_$(PHASE_)ASYMMETRIC_PUBLIC_KEY_MBEDTLS) += \ public_key.olib/mbedtls/ecdsa.c new file +84
-0@@ -0,0 +1,146 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (C) 2026 Philippe Reynes <[email protected]> +*/ + +#include <log.h> +#include <linux/errno.h> +#include <linux/string.h> +#include <linux/types.h> + +#include <crypto/internal/ecdsa.h> + +#include "mbedtls_options.h" /* required to access private fields */ +#include <mbedtls/ecdsa.h> +#include <mbedtls/ecp.h> + +static mbedtls_ecp_group_id ecdsa_search_group_id (const char *curve_name) +{ +mbedtls_ecp_group_id grp_id =MBEDTLS_ECP_DP_NONE ; +const mbedtls_ecp_curve_info *info; + +if (!curve_name) + goto out; + +if (!strcmp (curve_name,"prime256v1" )) +return MBEDTLS_ECP_DP_SECP256R1 ; + + info =mbedtls_ecp_curve_list (); +while (info && info->name) { +if (!strcmp (curve_name, info->name)) { + grp_id = info->grp_id; +break ; + } + info++; + } + + out: +return grp_id; +} + +int ecdsa_hash_verify (const struct ecdsa_public_key *pubkey, +const void *hash,size_t hash_len, +const void *signature,size_t sig_len) +{ +mbedtls_ecp_group_id grp_id; +mbedtls_ecp_group grp; +mbedtls_ecp_point Q ; +mbedtls_mpi r, s; +int key_len; +int err =-1 ; + + key_len =DIV_ROUND_UP (pubkey->size_bits,8 ); + +/* check the signature len */ +if (sig_len !=2 * key_len) { +log_debug ("sig len should be twice the key len (sig len = %zu, key len = %d)\n" , + sig_len, key_len); + err = -EINVAL ; + goto out; + } + +/* search the group */ + grp_id =ecdsa_search_group_id (pubkey->curve_name); +if (grp_id ==MBEDTLS_ECP_DP_NONE ) { +log_debug ("curve name %s not found\n" , pubkey->curve_name); + err = -EINVAL ; + goto out; + } + +/* init and load the group */ +mbedtls_ecp_group_init (&grp); + err =mbedtls_ecp_group_load (&grp, grp_id); +if (err) { + err = -EINVAL ; + goto out1; + } + +/* prepare the pubkey */ +mbedtls_ecp_point_init (&Q ); + err =mbedtls_mpi_read_binary (&Q .X, pubkey->x, key_len); +if (err) { +log_debug ("could not read value x of the public key (err = %d)\n" , + err); + err = -EINVAL ;
lib/mbedtls/ecdsa.c line 94
Quoted 10 lines
lib/mbedtls/ecdsa.c new file +10
-0+ goto out2; + } + err =mbedtls_mpi_read_binary (&Q .Y, pubkey->y, key_len); +if (err) { +log_debug ("could not read value y of the public key (err = %d)\n" , + err); + err = -EINVAL ; + goto out2; + } +mbedtls_mpi_lset (&Q .Z,1 );
'err = ' is missing.
Raymond
Quoted 55 lines
lib/mbedtls/ecdsa.c new file +52
-1+if (err) { +log_debug ("could not set value z of the public key (err = %d)\n" , + err); + err = -EINVAL ; + goto out2; + } + +/* check if the pubkey is valid */ + err =mbedtls_ecp_check_pubkey (&grp, &Q ); +if (err) { +log_debug ("public key is invalid (err = %d)\n" , err); + err = -EKEYREJECTED ; + goto out2; + } + +/* compute r */ +mbedtls_mpi_init (&r); + err =mbedtls_mpi_read_binary (&r, signature, key_len); +if (err) { +log_debug ("could not read value r of the signature (err = %d)\n" , + err); + err = -EINVAL ; + goto out3; + } + +/* compute s */ +mbedtls_mpi_init (&s); + err =mbedtls_mpi_read_binary (&s, signature + key_len, key_len); +if (err) { +log_debug ("could not read value s of the signature (err = %d)\n" , + err); + err = -EINVAL ; + goto out4; + } + +/* check the signature */ + err =mbedtls_ecdsa_verify (&grp, hash, hash_len, &Q , &r, &s); +if (err) + err = -EINVAL ; + + out4: +mbedtls_mpi_free (&s); + out3: +mbedtls_mpi_free (&r); + out2: +mbedtls_ecp_point_free (&Q ); + out1: +mbedtls_ecp_group_free (&grp); + out: + +return err; +} --2.43.0
PATCH v4 3/14 test: lib: ecdsa: add initial test
In reply to Philippe ReynesAdds tests to check that the function ecdsa_hash_verify using mbedtls is valid.
---
v2:
- little change to only use test with sha enabled
v3:
- remove useless field *k in struct ecdsa_test_vector_s
- change expected value on error (don't use mbedtls error)
- manage function returns
- update third parameter of sha*_csum_wd
v4:
- define SHA256_DEF_CHUNK_SZ, SHA384_DEF_CHUNK_SZ and SHA512_DEF_CHUNK_SZ
- report skipped tests
- add const on some variables
- code cleanup
include/u-boot/sha256.h | 2 + include/u-boot/sha512.h | 3 + test/lib/Makefile | 1 + test/lib/ecdsa.c | 453 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 459 insertions(+) create mode 100644 test/lib/ecdsa.c
include/u-boot/sha256.h +2 -0
@@ -15,6 +15,8 @@#define SHA256_SUM_LEN 32#define SHA256_DER_LEN 19 +#define SHA256_DEF_CHUNK_SZ 0x10000 +extern const uint8_t sha256_der_prefix[];/* Reset watchdog each time we process this many bytes */
include/u-boot/sha512.h +3 -0
@@ -14,6 +14,9 @@#define SHA512_DER_LEN 19#define SHA512_BLOCK_SIZE 128 +#define SHA384_DEF_CHUNK_SZ 0x10000 +#define SHA512_DEF_CHUNK_SZ 0x10000 +#define CHUNKSZ_SHA384 (16 * 1024)#define CHUNKSZ_SHA512 (16 * 1024)
test/lib/Makefile +1 -0
@@ -8,6 +8,7 @@ obj-$(CONFIG_$(PHASE_)UT_COMPRESSION) += compression.o ifeq ($(CONFIG_XPL_BUILD),) obj-y += abuf.o obj-y += alist.o +obj-$(CONFIG_ECDSA_MBEDTLS) += ecdsa.o obj-$(CONFIG_EFI_LOADER) += efi_device_path.o efi_memory.o obj-$(CONFIG_EFI_SECURE_BOOT) += efi_image_region.o ifdef CONFIG_RISCV
test/lib/ecdsa.c new file +453 -0
453 lines not on this page · raw message
Signature · 1 line
2.43.0
Re: [PATCH v4 03/14] test: lib: ecdsa: add initial test
Hi Philippe,
Quoted 15 lines · Philippe Reynes
test: lib: ecdsa: add initial test
Adds tests to check that the function
ecdsa_hash_verifyusing mbedtls is valid.Signed-off-by Philippe Reynes <[email protected]>
include/u-boot/sha256.h| 2 +include/u-boot/sha512.h | 3 + test/lib/Makefile | 1 + test/lib/ecdsa.c | 453 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 459 insertions(+)
test/lib/ecdsa.c line 4
Quoted 4 lines
test/lib/ecdsa.c +4
-0@@ -0,0 +1,453 @@ + }else { +ut_failf (uts, __FILE__, __LINE__, __func__,"Unknown hash type (%s)" , tv->hash_type); +return -EINVAL ; + }
Can you use ut_reportf() here?
include/u-boot/sha256.h line 15
Quoted 3 lines
include/u-boot/sha256.h +1
-0@@ -15,6 +15,8 @@ +#define SHA256_DEF_CHUNK_SZ 0x10000
I suspect you could use the existing CHUNKSZ_SHA256 (64 * 1024) instead. The same applies to SHA384_DEF_CHUNK_SZ and SHA512_DEF_CHUNK_SZ
test/lib/ecdsa.c line 11
Quoted 13 lines
test/lib/ecdsa.c +11
-0@@ -0,0 +1,453 @@ +static int ecdsa_test (struct unit_test_state *uts, +const struct ecdsa_test_vector_s *tv) +{ +struct ecdsa_public_key pubkey; +unsigned char x[528 /8 ]; +unsigned char y[528 /8 ]; +unsigned char hash[512 /8 ]; +size_t hash_len; +unsigned char signature[528 /8 *2 ]; +size_t sig_len; +int ret;
The magic number 528 is confusing since secp521r1 uses 521 bits. Please can you add a comment or define a constant like DIV_ROUND_UP(521, 8) ?
Regards,
Simon
Re: [PATCH v4 03/14] test: lib: ecdsa: add initial test
In reply to Philippe ReynesHi Philippe,
Quoted 525 lines · Philippe Reynes
Adds tests to check that the function
ecdsa_hash_verifyusing mbedtls is valid.Signed-off-by Philippe Reynes <[email protected]>---
v2:
- little change to only use test with sha enabled
v3:
- remove useless field *k in structecdsa_test_vector_s
- change expected value on error (don't use mbedtls error)
- manage function returns
- update third parameter of sha*_csum_wd
v4:
- defineSHA256_DEF_CHUNK_SZ,SHA384_DEF_CHUNK_SZandSHA512_DEF_CHUNK_SZ
- report skipped tests
- add const on some variables
- code cleanupinclude/u-boot/sha256.h | 2 + include/u-boot/sha512.h | 3 + test/lib/Makefile | 1 + test/lib/ecdsa.c | 453 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 459 insertions(+) create mode 100644 test/lib/ecdsa.cinclude/u-boot/sha256.h +2
-0@@ -15,6 +15,8 @@#define SHA256_SUM_LEN 32#define SHA256_DER_LEN 19 +#define SHA256_DEF_CHUNK_SZ 0x10000 +extern const uint8_t sha256_der_prefix[];/* Reset watchdog each time we process this many bytes */ include/u-boot/sha512.h +3
-0@@ -14,6 +14,9 @@#define SHA512_DER_LEN 19#define SHA512_BLOCK_SIZE 128 +#define SHA384_DEF_CHUNK_SZ 0x10000 +#define SHA512_DEF_CHUNK_SZ 0x10000 +#define CHUNKSZ_SHA384 (16 * 1024)#define CHUNKSZ_SHA512 (16 * 1024)test/lib/Makefile +1
-0@@ -8,6 +8,7 @@ obj-$(CONFIG_$(PHASE_)UT_COMPRESSION) += compression.o ifeq ($(CONFIG_XPL_BUILD),) obj-y += abuf.o obj-y += alist.o +obj-$(CONFIG_ECDSA_MBEDTLS) += ecdsa.o obj-$(CONFIG_EFI_LOADER) += efi_device_path.o efi_memory.o obj-$(CONFIG_EFI_SECURE_BOOT) += efi_image_region.o ifdef CONFIG_RISCVtest/lib/ecdsa.c new file +453
-1@@ -0,0 +1,453 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (C) 2026 Philippe Reynes <[email protected]> +*/ + +#include <command.h> +#include <image.h> +#include <test/lib.h> +#include <test/test.h> +#include <test/ut.h> +#include <crypto/ecdsa-uclass.h> +#include <crypto/internal/ecdsa.h> + +struct ecdsa_test_vector_s { +const char *test_name; +const char *curve_name; +const char *x; +const char *y; +int size_bits; +const char *hash_type; +const char *hash_message; +const char *r; +const char *s; +int expected; +}; + +/* +* Those data come from RFC6979 +*/ + +static const struct ecdsa_test_vector_s ecdsa_test_vector[] = { +/* +* secp192r1 +*/ + { + .test_name ="secp192r1 sha1" , + .curve_name ="secp192r1" , + .x ="AC2C77F529F91689FEA0EA5EFEC7F210D8EEA0B9E047ED56" , + .y ="3BC723E57670BD4887EBC732C523063D0A7C957BC97C1C43" , + .size_bits =192 , + .hash_type ="sha-1" , + .hash_message ="sample" , + .r ="98C6BD12B23EAF5E2A2045132086BE3EB8EBD62ABF6698FF" , + .s ="57A22B07DEA9530F8DE9471B1DC6624472E8E2844BC25B64" , + .expected =0 , + }, + { + .test_name ="secp192r1 sha256" , + .curve_name ="secp192r1" , + .x ="AC2C77F529F91689FEA0EA5EFEC7F210D8EEA0B9E047ED56" , + .y ="3BC723E57670BD4887EBC732C523063D0A7C957BC97C1C43" , + .size_bits =192 , + .hash_type ="sha-256" , + .hash_message ="sample" , + .r ="4B0B8CE98A92866A2820E20AA6B75B56382E0F9BFD5ECB55" , + .s ="CCDB006926EA9565CBADC840829D8C384E06DE1F1E381B85" , + .expected =0 , + }, + { + .test_name ="secp192r1 sha384" , + .curve_name ="secp192r1" , + .x ="AC2C77F529F91689FEA0EA5EFEC7F210D8EEA0B9E047ED56" , + .y ="3BC723E57670BD4887EBC732C523063D0A7C957BC97C1C43" , + .size_bits =192 , + .hash_type ="sha-384" , + .hash_message ="sample" , + .r ="DA63BF0B9ABCF948FBB1E9167F136145F7A20426DCC287D5" , + .s ="C3AA2C960972BD7A2003A57E1C4C77F0578F8AE95E31EC5E" , + .expected =0 , + }, + { + .test_name ="secp192r1 sha512" , + .curve_name ="secp192r1" , + .x ="AC2C77F529F91689FEA0EA5EFEC7F210D8EEA0B9E047ED56" , + .y ="3BC723E57670BD4887EBC732C523063D0A7C957BC97C1C43" , + .size_bits =192 , + .hash_type ="sha-512" , + .hash_message ="sample" , + .r ="4D60C5AB1996BD848343B31C00850205E2EA6922DAC2E4B8" , + .s ="3F6E837448F027A1BF4B34E796E32A811CBB4050908D8F67" , + .expected =0 , + }, + { + .test_name ="secp192r1 sha512 error" , + .curve_name ="secp192r1" , + .x ="AC2C77F529F91689FEA0EA5EFEC7F210D8EEA0B9E047ED56" , + .y ="3BC723E57670BD4887EBC732C523063D0A7C957BC97C1C43" , + .size_bits =192 , + .hash_type ="sha-512" , + .hash_message ="sample" , + .r ="4D60C5AB1996BD848343B31C00850205E2EA6922DAC2E4B8" , + .s ="0F6E837448F027A1BF4B34E796E32A811CBB4050908D8F67" , + .expected = -EINVAL , + }, +/* +* secp224r1 +*/ + { + .test_name ="secp224r1 sha1" , + .curve_name ="secp224r1" , + .x ="00CF08DA5AD719E42707FA431292DEA11244D64FC51610D94B130D6C" , + .y ="EEAB6F3DEBE455E3DBF85416F7030CBD94F34F2D6F232C69F3C1385A" , + .size_bits =224 , + .hash_type ="sha-1" , + .hash_message ="sample" , + .r ="22226F9D40A96E19C4A301CE5B74B115303C0F3A4FD30FC257FB57AC" , + .s ="66D1CDD83E3AF75605DD6E2FEFF196D30AA7ED7A2EDF7AF475403D69" , + .expected =0 , + }, + { + .test_name ="secp224r1 sha256" , + .curve_name ="secp224r1" , + .x ="00CF08DA5AD719E42707FA431292DEA11244D64FC51610D94B130D6C" , + .y ="EEAB6F3DEBE455E3DBF85416F7030CBD94F34F2D6F232C69F3C1385A" , + .size_bits =224 , + .hash_type ="sha-256" , + .hash_message ="sample" , + .r ="61AA3DA010E8E8406C656BC477A7A7189895E7E840CDFE8FF42307BA" , + .s ="BC814050DAB5D23770879494F9E0A680DC1AF7161991BDE692B10101" , + .expected =0 , + }, + { + .test_name ="secp224r1 sha384" , + .curve_name ="secp224r1" , + .x ="00CF08DA5AD719E42707FA431292DEA11244D64FC51610D94B130D6C" , + .y ="EEAB6F3DEBE455E3DBF85416F7030CBD94F34F2D6F232C69F3C1385A" , + .size_bits =224 , + .hash_type ="sha-384" , + .hash_message ="sample" , + .r ="0B115E5E36F0F9EC81F1325A5952878D745E19D7BB3EABFABA77E953" , + .s ="830F34CCDFE826CCFDC81EB4129772E20E122348A2BBD889A1B1AF1D" , + .expected =0 , + }, + { + .test_name ="secp224r1 sha512" , + .curve_name ="secp224r1" , + .x ="00CF08DA5AD719E42707FA431292DEA11244D64FC51610D94B130D6C" , + .y ="EEAB6F3DEBE455E3DBF85416F7030CBD94F34F2D6F232C69F3C1385A" , + .size_bits =224 , + .hash_type ="sha-512" , + .hash_message ="sample" , + .r ="074BD1D979D5F32BF958DDC61E4FB4872ADCAFEB2256497CDAC30397" , + .s ="A4CECA196C3D5A1FF31027B33185DC8EE43F288B21AB342E5D8EB084" , + .expected =0 , + }, + { + .test_name ="secp224r1 sha512 error" , + .curve_name ="secp224r1" , + .x ="00CF08DA5AD719E42707FA431292DEA11244D64FC51610D94B130D6C" , + .y ="EEAB6F3DEBE455E3DBF85416F7030CBD94F34F2D6F232C69F3C1385A" , + .size_bits =224 , + .hash_type ="sha-512" , + .hash_message ="sample" , + .r ="074BD1D979D5F32BF958DDC61E4FB4872ADCAFEB2256497CDAC30397" , + .s ="04CECA196C3D5A1FF31027B33185DC8EE43F288B21AB342E5D8EB084" , + .expected = -EINVAL , + }, +/* +* secp256r1 +*/ + { + .test_name ="secp256r1 sha1" , + .curve_name ="secp256r1" , + .x ="60FED4BA255A9D31C961EB74C6356D68C049B8923B61FA6CE669622E60F29FB6" , + .y ="7903FE1008B8BC99A41AE9E95628BC64F2F1B20C2D7E9F5177A3C294D4462299" , + .size_bits =256 , + .hash_type ="sha-1" , + .hash_message ="sample" , + .r ="61340C88C3AAEBEB4F6D667F672CA9759A6CCAA9FA8811313039EE4A35471D32" , + .s ="6D7F147DAC089441BB2E2FE8F7A3FA264B9C475098FDCF6E00D7C996E1B8B7EB" , + .expected =0 , + }, + { + .test_name ="secp256r1 sha256" , + .curve_name ="secp256r1" , + .x ="60FED4BA255A9D31C961EB74C6356D68C049B8923B61FA6CE669622E60F29FB6" , + .y ="7903FE1008B8BC99A41AE9E95628BC64F2F1B20C2D7E9F5177A3C294D4462299" , + .size_bits =256 , + .hash_type ="sha-256" , + .hash_message ="sample" , + .r ="EFD48B2AACB6A8FD1140DD9CD45E81D69D2C877B56AAF991C34D0EA84EAF3716" , + .s ="F7CB1C942D657C41D436C7A1B6E29F65F3E900DBB9AFF4064DC4AB2F843ACDA8" , + .expected =0 , + }, + { + .test_name ="secp256r1 sha384" , + .curve_name ="secp256r1" , + .x ="60FED4BA255A9D31C961EB74C6356D68C049B8923B61FA6CE669622E60F29FB6" , + .y ="7903FE1008B8BC99A41AE9E95628BC64F2F1B20C2D7E9F5177A3C294D4462299" , + .size_bits =256 , + .hash_type ="sha-384" , + .hash_message ="sample" , + .r ="0EAFEA039B20E9B42309FB1D89E213057CBF973DC0CFC8F129EDDDC800EF7719" , + .s ="4861F0491E6998B9455193E34E7B0D284DDD7149A74B95B9261F13ABDE940954" , + .expected =0 , + }, + { + .test_name ="secp256r1 sha512" , + .curve_name ="secp256r1" , + .x ="60FED4BA255A9D31C961EB74C6356D68C049B8923B61FA6CE669622E60F29FB6" , + .y ="7903FE1008B8BC99A41AE9E95628BC64F2F1B20C2D7E9F5177A3C294D4462299" , + .size_bits =256 , + .hash_type ="sha-512" , + .hash_message ="sample" , + .r ="8496A60B5E9B47C825488827E0495B0E3FA109EC4568FD3F8D1097678EB97F00" , + .s ="2362AB1ADBE2B8ADF9CB9EDAB740EA6049C028114F2460F96554F61FAE3302FE" , + .expected =0 , + }, + { + .test_name ="secp256r1 sha512 error" , + .curve_name ="secp256r1" , + .x ="60FED4BA255A9D31C961EB74C6356D68C049B8923B61FA6CE669622E60F29FB6" , + .y ="7903FE1008B8BC99A41AE9E95628BC64F2F1B20C2D7E9F5177A3C294D4462299" , + .size_bits =256 , + .hash_type ="sha-512" , + .hash_message ="sample" , + .r ="8496A60B5E9B47C825488827E0495B0E3FA109EC4568FD3F8D1097678EB97F00" , + .s ="0362AB1ADBE2B8ADF9CB9EDAB740EA6049C028114F2460F96554F61FAE3302FE" , + .expected = -EINVAL , + }, +/* +* secp384r1 +*/ + { + .test_name ="secp384r1 sha1" , + .curve_name ="secp384r1" , + .x ="EC3A4E415B4E19A4568618029F427FA5DA9A8BC4AE92E02E06AAE5286B300C64DEF8F0EA9055866064A254515480BC13" , + .y ="8015D9B72D7D57244EA8EF9AC0C621896708A59367F9DFB9F54CA84B3F1C9DB1288B231C3AE0D4FE7344FD2533264720" , + .size_bits =384 , + .hash_type ="sha-1" , + .hash_message ="sample" , + .r ="EC748D839243D6FBEF4FC5C4859A7DFFD7F3ABDDF72014540C16D73309834FA37B9BA002899F6FDA3A4A9386790D4EB2" , + .s ="A3BCFA947BEEF4732BF247AC17F71676CB31A847B9FF0CBC9C9ED4C1A5B3FACF26F49CA031D4857570CCB5CA4424A443" , + .expected =0 , + }, + { + .test_name ="secp384r1 sha256" , + .curve_name ="secp384r1" , + .x ="EC3A4E415B4E19A4568618029F427FA5DA9A8BC4AE92E02E06AAE5286B300C64DEF8F0EA9055866064A254515480BC13" , + .y ="8015D9B72D7D57244EA8EF9AC0C621896708A59367F9DFB9F54CA84B3F1C9DB1288B231C3AE0D4FE7344FD2533264720" , + .size_bits =384 , + .hash_type ="sha-256" , + .hash_message ="sample" , + .r ="21B13D1E013C7FA1392D03C5F99AF8B30C570C6F98D4EA8E354B63A21D3DAA33BDE1E888E63355D92FA2B3C36D8FB2CD" , + .s ="F3AA443FB107745BF4BD77CB3891674632068A10CA67E3D45DB2266FA7D1FEEBEFDC63ECCD1AC42EC0CB8668A4FA0AB0" , + .expected =0 , + }, + { + .test_name ="secp384r1 sha384" , + .curve_name ="secp384r1" , + .x ="EC3A4E415B4E19A4568618029F427FA5DA9A8BC4AE92E02E06AAE5286B300C64DEF8F0EA9055866064A254515480BC13" , + .y ="8015D9B72D7D57244EA8EF9AC0C621896708A59367F9DFB9F54CA84B3F1C9DB1288B231C3AE0D4FE7344FD2533264720" , + .size_bits =384 , + .hash_type ="sha-384" , + .hash_message ="sample" , + .r ="94EDBB92A5ECB8AAD4736E56C691916B3F88140666CE9FA73D64C4EA95AD133C81A648152E44ACF96E36DD1E80FABE46" , + .s ="99EF4AEB15F178CEA1FE40DB2603138F130E740A19624526203B6351D0A3A94FA329C145786E679E7B82C71A38628AC8" , + .expected =0 , + }, + { + .test_name ="secp384r1 sha512" , + .curve_name ="secp384r1" , + .x ="EC3A4E415B4E19A4568618029F427FA5DA9A8BC4AE92E02E06AAE5286B300C64DEF8F0EA9055866064A254515480BC13" , + .y ="8015D9B72D7D57244EA8EF9AC0C621896708A59367F9DFB9F54CA84B3F1C9DB1288B231C3AE0D4FE7344FD2533264720" , + .size_bits =384 , + .hash_type ="sha-512" , + .hash_message ="sample" , + .r ="ED0959D5880AB2D869AE7F6C2915C6D60F96507F9CB3E047C0046861DA4A799CFE30F35CC900056D7C99CD7882433709" , + .s ="512C8CCEEE3890A84058CE1E22DBC2198F42323CE8ACA9135329F03C068E5112DC7CC3EF3446DEFCEB01A45C2667FDD5" , + .expected =0 , + }, + { + .test_name ="secp384r1 sha512 error" , + .curve_name ="secp384r1" , + .x ="EC3A4E415B4E19A4568618029F427FA5DA9A8BC4AE92E02E06AAE5286B300C64DEF8F0EA9055866064A254515480BC13" , + .y ="8015D9B72D7D57244EA8EF9AC0C621896708A59367F9DFB9F54CA84B3F1C9DB1288B231C3AE0D4FE7344FD2533264720" , + .size_bits =384 , + .hash_type ="sha-512" , + .hash_message ="sample" , + .r ="ED0959D5880AB2D869AE7F6C2915C6D60F96507F9CB3E047C0046861DA4A799CFE30F35CC900056D7C99CD7882433709" , + .s ="012C8CCEEE3890A84058CE1E22DBC2198F42323CE8ACA9135329F03C068E5112DC7CC3EF3446DEFCEB01A45C2667FDD5" , + .expected = -EINVAL , + }, +/* +* secp521r1 +*/ + { + .test_name ="secp521r1 sha1" , + .curve_name ="secp521r1" , + .x ="01894550D0785932E00EAA23B694F213F8C3121F86DC97A04E5A7167DB4E5BCD371123D46E45DB6B5D5370A7F20FB633155D38FFA16D2BD761DCAC474B9A2F5023A4" , + .y ="00493101C962CD4D2FDDF782285E64584139C2F91B47F87FF82354D6630F746A28A0DB25741B5B34A828008B22ACC23F924FAAFBD4D33F81EA66956DFEAA2BFDFCF5" , + .size_bits =521 , + .hash_type ="sha-1" , + .hash_message ="sample" , + .r ="00343B6EC45728975EA5CBA6659BBB6062A5FF89EEA58BE3C80B619F322C87910FE092F7D45BB0F8EEE01ED3F20BABEC079D202AE677B243AB40B5431D497C55D75D" , + .s ="00E7B0E675A9B24413D448B8CC119D2BF7B2D2DF032741C096634D6D65D0DBE3D5694625FB9E8104D3B842C1B0E2D0B98BEA19341E8676AEF66AE4EBA3D5475D5D16" , + .expected =0 , + }, + { + .test_name ="secp521r1 sha256" , + .curve_name ="secp521r1" , + .x ="01894550D0785932E00EAA23B694F213F8C3121F86DC97A04E5A7167DB4E5BCD371123D46E45DB6B5D5370A7F20FB633155D38FFA16D2BD761DCAC474B9A2F5023A4" , + .y ="00493101C962CD4D2FDDF782285E64584139C2F91B47F87FF82354D6630F746A28A0DB25741B5B34A828008B22ACC23F924FAAFBD4D33F81EA66956DFEAA2BFDFCF5" , + .size_bits =521 , + .hash_type ="sha-256" , + .hash_message ="sample" , + .r ="01511BB4D675114FE266FC4372B87682BAECC01D3CC62CF2303C92B3526012659D16876E25C7C1E57648F23B73564D67F61C6F14D527D54972810421E7D87589E1A7" , + .s ="004A171143A83163D6DF460AAF61522695F207A58B95C0644D87E52AA1A347916E4F7A72930B1BC06DBE22CE3F58264AFD23704CBB63B29B931F7DE6C9D949A7ECFC" , + .expected =0 , + }, + { + .test_name ="secp521r1 sha384" , + .curve_name ="secp521r1" , + .x ="01894550D0785932E00EAA23B694F213F8C3121F86DC97A04E5A7167DB4E5BCD371123D46E45DB6B5D5370A7F20FB633155D38FFA16D2BD761DCAC474B9A2F5023A4" , + .y ="00493101C962CD4D2FDDF782285E64584139C2F91B47F87FF82354D6630F746A28A0DB25741B5B34A828008B22ACC23F924FAAFBD4D33F81EA66956DFEAA2BFDFCF5" , + .size_bits =521 , + .hash_type ="sha-384" , + .hash_message ="sample" , + .r ="01EA842A0E17D2DE4F92C15315C63DDF72685C18195C2BB95E572B9C5136CA4B4B576AD712A52BE9730627D16054BA40CC0B8D3FF035B12AE75168397F5D50C67451" , + .s ="01F21A3CEE066E1961025FB048BD5FE2B7924D0CD797BABE0A83B66F1E35EEAF5FDE143FA85DC394A7DEE766523393784484BDF3E00114A1C857CDE1AA203DB65D61" , + .expected =0 , + }, + { + .test_name ="secp521r1 sha512" , + .curve_name ="secp521r1" , + .x ="01894550D0785932E00EAA23B694F213F8C3121F86DC97A04E5A7167DB4E5BCD371123D46E45DB6B5D5370A7F20FB633155D38FFA16D2BD761DCAC474B9A2F5023A4" , + .y ="00493101C962CD4D2FDDF782285E64584139C2F91B47F87FF82354D6630F746A28A0DB25741B5B34A828008B22ACC23F924FAAFBD4D33F81EA66956DFEAA2BFDFCF5" , + .size_bits =521 , + .hash_type ="sha-512" , + .hash_message ="sample" , + .r ="00C328FAFCBD79DD77850370C46325D987CB525569FB63C5D3BC53950E6D4C5F174E25A1EE9017B5D450606ADD152B534931D7D4E8455CC91F9B15BF05EC36E377FA" , + .s ="00617CCE7CF5064806C467F678D3B4080D6F1CC50AF26CA209417308281B68AF282623EAA63E5B5C0723D8B8C37FF0777B1A20F8CCB1DCCC43997F1EE0E44DA4A67A" , + .expected =0 , + }, + { + .test_name ="secp521r1 sha512 error" , + .curve_name ="secp521r1" , + .x ="01894550D0785932E00EAA23B694F213F8C3121F86DC97A04E5A7167DB4E5BCD371123D46E45DB6B5D5370A7F20FB633155D38FFA16D2BD761DCAC474B9A2F5023A4" , + .y ="00493101C962CD4D2FDDF782285E64584139C2F91B47F87FF82354D6630F746A28A0DB25741B5B34A828008B22ACC23F924FAAFBD4D33F81EA66956DFEAA2BFDFCF5" , + .size_bits =521 , + .hash_type ="sha-512" , + .hash_message ="sample" , + .r ="00C328FAFCBD79DD77850370C46325D987CB525569FB63C5D3BC53950E6D4C5F174E25A1EE9017B5D450606ADD152B534931D7D4E8455CC91F9B15BF05EC36E377FA" , + .s ="00017CCE7CF5064806C467F678D3B4080D6F1CC50AF26CA209417308281B68AF282623EAA63E5B5C0723D8B8C37FF0777B1A20F8CCB1DCCC43997F1EE0E44DA4A67A" , + .expected = -EINVAL , + }, +}; + +static int ecdsa_test (struct unit_test_state *uts, +const struct ecdsa_test_vector_s *tv) +{ +struct ecdsa_public_key pubkey; +unsigned char x[528 /8 ]; +unsigned char y[528 /8 ]; +unsigned char hash[512 /8 ]; +size_t hash_len; +unsigned char signature[528 /8 *2 ]; +size_t sig_len; +int ret; + + sig_len =DIV_ROUND_UP (tv->size_bits,8 ); + + pubkey.curve_name = tv->curve_name; + ret =hex2bin (x, tv->x,strlen (tv->x) /2 ); +ut_asserteq (0 , ret); + pubkey.x = x; + ret =hex2bin (y, tv->y,strlen (tv->y) /2 ); +ut_asserteq (0 , ret); + pubkey.y = y; + pubkey.size_bits = tv->size_bits; + +if (!strcmp (tv->hash_type,"sha-1" )) { +#if CONFIG_IS_ENABLED (SHA1 ) + hash_len =SHA1_SUM_LEN ; +sha1_csum_wd (tv->hash_message,strlen (tv->hash_message), + hash,SHA1_DEF_CHUNK_SZ ); +#else +/* sha1 is not supported so we skip this test */ +ut_reportf ("Test %s skipped (sha1 not supported)" , + tv->test_name); + goto out; +#endif + }else if (!strcmp (tv->hash_type,"sha-256" )) { +#if CONFIG_IS_ENABLED (SHA256 ) + hash_len =SHA256_SUM_LEN ; +sha256_csum_wd (tv->hash_message,strlen (tv->hash_message), + hash,SHA256_DEF_CHUNK_SZ ); +#else +/* sha256 is not supported so we skip this test */ +ut_reportf ("Test %s skipped (sha256 not supported)" , + tv->test_name); + goto out; +#endif + }else if (!strcmp (tv->hash_type,"sha-384" )) { +#if CONFIG_IS_ENABLED (SHA384 ) + hash_len =SHA384_SUM_LEN ; +sha384_csum_wd (tv->hash_message,strlen (tv->hash_message), + hash,SHA384_DEF_CHUNK_SZ ); +#else +/* sha384 is not supported so we skip this test */ +ut_reportf ("Test %s skipped (sha384 not supported)" , + tv->test_name); + goto out; +#endif + }else if (!strcmp (tv->hash_type,"sha-512" )) { +#if CONFIG_IS_ENABLED (SHA512 ) + hash_len =SHA512_SUM_LEN ; +sha512_csum_wd (tv->hash_message,strlen (tv->hash_message), + hash,SHA512_DEF_CHUNK_SZ ); +#else +/* sha512 is not supported so we skip this test */ +ut_reportf ("Test %s skipped (sha512 not supported)" , + tv->test_name); + goto out; +#endif + }else { +ut_failf (uts, __FILE__, __LINE__, __func__,"Unknown hash type (%s)" , tv->hash_type); +return -EINVAL ; + } + + ret =hex2bin (signature, tv->r, sig_len); +ut_asserteq (0 , ret); + ret =hex2bin (signature + sig_len, tv->s, sig_len); +ut_asserteq (0 , ret); + sig_len = sig_len *2 ; + + ret =ecdsa_hash_verify (&pubkey, + hash, hash_len, + signature, sig_len); +ut_asserteq (tv->expected, ret); + +#if !CONFIG_IS_ENABLED (SHA1 ) || !CONFIG_IS_ENABLED (SHA256 ) || !CONFIG_IS_ENABLED (SHA384 ) || !CONFIG_IS_ENABLED (SHA512 ) + out: +#endif + +return 0 ; +} + +static int lib_ecdsa (struct unit_test_state *uts) +{ +int i, ret; +size_t num_test =ARRAY_SIZE (ecdsa_test_vector); + +for (i =0 ; i < num_test; i++) { + ret =ecdsa_test (uts, &ecdsa_test_vector[i]); +if (ret) +return ret; + } + +return 0 ; +} + +LIB_TEST (lib_ecdsa,0 ); --
Quoted 2 lines
2.43.0
Thanks and regards,
Raymond
PATCH v4 4/14 drivers: crypto: add software ecdsa support
In reply to Philippe ReynesAdd a software ecdsa driver so it is
now possible to use ecdsa signature on
board without ecdsa hardware support.
---
v2:
- no change
v3:
- add depends on ECDSA_VERIFY to ECDSA_SW
- change sw_ecdsa_verify to ecdsa_hash_verify
- v4
- use ECDSA_MBEDTLS to build the driver
- clean include (change order)
drivers/crypto/Makefile | 1 + drivers/crypto/ecdsa/Makefile | 6 ++++++ drivers/crypto/ecdsa/ecdsa-sw.c | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) create mode 100644 drivers/crypto/ecdsa/Makefile create mode 100644 drivers/crypto/ecdsa/ecdsa-sw.c
drivers/crypto/Makefile +1 -0
@@ -4,6 +4,7 @@ # http://www.samsung.com obj-$(CONFIG_EXYNOS_ACE_SHA) += ace_sha.o +obj-$(CONFIG_ECDSA) += ecdsa/ obj-y += aes/ obj-y += rsa_mod_exp/ obj-y += fsl/
drivers/crypto/ecdsa/Makefile new file +6 -0
@@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# Copyright (C) 2026 Philippe Reynes <[email protected]> +# + +obj-$(CONFIG_ECDSA_MBEDTLS) += ecdsa-sw.o
drivers/crypto/ecdsa/ecdsa-sw.c new file +33 -0
@@ -0,0 +1,33 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (C) 2026 Philippe Reynes <[email protected]> +*/ +#include <crypto/ecdsa-uclass.h> +#include <crypto/internal/ecdsa.h> +#include <dm.h> +#include <linux/types.h> +#include <u-boot/ecdsa.h> + +static int ops_sw_ecdsa_verify (__always_unused struct udevice *dev, +const struct ecdsa_public_key *pubkey, +const void *hash,size_t hash_len, +const void *signature,size_t sig_len) +{ +return ecdsa_hash_verify (pubkey, hash, hash_len, signature, sig_len); +} + +static const struct ecdsa_ops sw_ecdsa_ops = { + .verify = ops_sw_ecdsa_verify, +}; + +U_BOOT_DRIVER (sw_ecdsa) = { + .name ="sw_ecdsa" , + .id =UCLASS_ECDSA , + .ops = &sw_ecdsa_ops, + .flags =DM_FLAG_PRE_RELOC , +}; + +U_BOOT_DRVINFO (sw_ecdsa) = { + .name ="sw_ecdsa" , +}; +
Signature · 1 line
2.43.0
Re: [PATCH v4 04/14] drivers: crypto: add software ecdsa support
Hi Philippe,
Quoted 15 lines · Philippe Reynes
drivers: crypto: add software ecdsa support
Add a software ecdsa driver so it is
now possible to use ecdsa signature on
board without ecdsa hardware support.Signed-off-by Philippe Reynes <[email protected]>
drivers/crypto/Makefile| 1 +drivers/crypto/ecdsa/Makefile | 6 ++++++ drivers/crypto/ecdsa/ecdsa-sw.c | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+)
drivers/crypto/ecdsa/Makefile line 1
Quoted 1 line
drivers/crypto/ecdsa/Makefile +1
-0@@ -0,0 +1,6 @@ +obj-$(CONFIG_ECDSA_MBEDTLS) += ecdsa-sw.o
This should use CONFIG_$(PHASE_)ECDSA_MBEDTLS for consistency with lib/mbedtls/Makefile. Otherwise SPL builds defining SPL_ECDSA_MBEDTLS will not include this driver.
Regards,
Simon
Re: [PATCH v4 04/14] drivers: crypto: add software ecdsa support
In reply to Philippe ReynesHi Philippe,
Quoted 41 lines · Philippe Reynes
Add a software ecdsa driver so it is
now possible to use ecdsa signature on
board without ecdsa hardware support.Signed-off-by Philippe Reynes <[email protected]>---
v2:
- no change
v3:
- add depends onECDSA_VERIFYtoECDSA_SW
- changesw_ecdsa_verifytoecdsa_hash_verify
- v4
- useECDSA_MBEDTLSto build the driver
- clean include (change order)drivers/crypto/Makefile | 1 + drivers/crypto/ecdsa/Makefile | 6 ++++++ drivers/crypto/ecdsa/ecdsa-sw.c | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) create mode 100644 drivers/crypto/ecdsa/Makefile create mode 100644 drivers/crypto/ecdsa/ecdsa-sw.cdrivers/crypto/Makefile +1
-0@@ -4,6 +4,7 @@ # http://www.samsung.com obj-$(CONFIG_EXYNOS_ACE_SHA) += ace_sha.o +obj-$(CONFIG_ECDSA) += ecdsa/ obj-y += aes/ obj-y += rsa_mod_exp/ obj-y += fsl/drivers/crypto/ecdsa/Makefile new file +0
-0
drivers/crypto/ecdsa/Makefile line 6
Quoted 6 lines
drivers/crypto/ecdsa/Makefile new file +6
-0@@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# Copyright (C) 2026 Philippe Reynes <[email protected]> +# + +obj-$(CONFIG_ECDSA_MBEDTLS) += ecdsa-sw.o
As Simon already pointed out, please use 'CONFIG_$(PHASE_)ECDSA_MBEDTLS'. With this change applied,
Thanks and regards,
Raymond
Quoted 42 lines
drivers/crypto/ecdsa/ecdsa-sw.c new file +33
-1@@ -0,0 +1,33 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* +* Copyright (C) 2026 Philippe Reynes <[email protected]> +*/ +#include <crypto/ecdsa-uclass.h> +#include <crypto/internal/ecdsa.h> +#include <dm.h> +#include <linux/types.h> +#include <u-boot/ecdsa.h> + +static int ops_sw_ecdsa_verify (__always_unused struct udevice *dev, +const struct ecdsa_public_key *pubkey, +const void *hash,size_t hash_len, +const void *signature,size_t sig_len) +{ +return ecdsa_hash_verify (pubkey, hash, hash_len, signature, sig_len); +} + +static const struct ecdsa_ops sw_ecdsa_ops = { + .verify = ops_sw_ecdsa_verify, +}; + +U_BOOT_DRIVER (sw_ecdsa) = { + .name ="sw_ecdsa" , + .id =UCLASS_ECDSA , + .ops = &sw_ecdsa_ops, + .flags =DM_FLAG_PRE_RELOC , +}; + +U_BOOT_DRVINFO (sw_ecdsa) = { + .name ="sw_ecdsa" , +}; + --2.43.0
PATCH v4 5/14 ecdsa: fix support of secp521r1
In reply to Philippe ReynesCurrent implementation of ecdsa only supports key len aligned on 8 bits. But the curve secp521r1 uses a key of 521 bits which is not aligned on 8 bits. In this commit, we update the keys management for ecdsa to support keys that are not aligned on 8 bits.
---
v2:
- intitial version
v3:
- fix typo in comments
v4:
- fix commit message
- clean code with DIV_ROUND_UP-
- duplicate data before shifting
- support ecdsa521 and secp521r1
- clean code
lib/ecdsa/ecdsa-libcrypto.c | 54 +++++++++++++++++++++++++++++-- lib/ecdsa/ecdsa-verify.c | 64 +++++++++++++++++++++++++++++++++---- lib/fdt-libcrypto.c | 2 +- tools/image-sig-host.c | 7 ++++ 4 files changed, 117 insertions(+), 10 deletions(-)
lib/ecdsa/ecdsa-libcrypto.c +52 -2
@@ -26,6 +26,8 @@#include <openssl/ec.h> #include <openssl/bn.h> +#define DIV_ROUND_UP (n, d) (((n) + (d) - 1) / (d)) +/* Image signing context for openssl-libcrypto */ struct signer {EVP_PKEY *evp_key;/* Pointer to EVP_PKEY object */
@@ -41,10 +43,26 @@ struct ecdsa_public_key {int size_bits; }; +static char *memdup (char *buf,size_t size) +{ +char *dup; + + dup =malloc (size); +if (dup) +memcpy (dup, buf, size); + +return dup; +} +static int fdt_get_key (struct ecdsa_public_key *key,const void *fdt,int node) { +const char *x; +const char *y;int x_len;int y_len; +int expected_len; + +memset (key,0 ,sizeof (*key)); key->curve_name =fdt_getprop (fdt, node,"ecdsa,curve" ,NULL );if (!key->curve_name)
@@ -54,6 +72,8 @@ static int fdt_get_key(struct ecdsa_public_key *key, const void *fdt, int node) key->size_bits =256 ; else if (!strcmp(key->curve_name, "secp384r1")) key->size_bits =384 ; + else if (!strcmp(key->curve_name, "secp521r1")) + key->size_bits =521 ; else return -EINVAL;
@@ -63,12 +83,34 @@ static int fdt_get_key(struct ecdsa_public_key *key, const void *fdt, int node)if (!key->x || !key->y)return -EINVAL ; -if (x_len != key->size_bits /8 || y_len != key->size_bits /8 ) +/* +* The public key is stored as an array of u32, so if the key size is +* not a multiple of 32 (for example 521), we may have extra bytes. +* To avoid any issue later, we shift the x and y pointer to the first +* useful byte. +*/ + expected_len =DIV_ROUND_UP (key->size_bits,8 ); + +if (x_len < expected_len || y_len < expected_len)return -EINVAL ; + x =memdup ((char *)key->x + (x_len - expected_len), expected_len); + key->x = (const uint8_t *)x; + + y =memdup ((char *)key->y + (y_len - expected_len), expected_len); + key->y = (const uint8_t *)y; +return 0 ; } +static void fdt_free_key (struct ecdsa_public_key *key) +{ +if (!key) +return ; +free ((char *)key->x); +free ((char *)key->y); +} +static int read_key_from_fdt (struct signer *ctx,const void *fdt,int node) {struct ecdsa_public_key pubkey;
@@ -89,8 +131,11 @@ static int read_key_from_fdt(struct signer *ctx, const void *fdt, int node) nid = NID_X9_62_prime256v1; }else if (!strcmp (pubkey.curve_name,"secp384r1" )) { nid = NID_secp384r1; + }else if (!strcmp (pubkey.curve_name,"secp521r1" )) { + nid = NID_secp521r1; }else {fprintf (stderr,"Unsupported curve name: '%s'\n" , pubkey.curve_name); +fdt_free_key (&pubkey);return -EINVAL ; }
@@ -100,6 +145,7 @@ static int read_key_from_fdt(struct signer *ctx, const void *fdt, int node) ec_key =EC_KEY_new_by_curve_name (nid);if (!ec_key) {fprintf (stderr,"Failed to allocate EC_KEY for curve %s\n" , pubkey.curve_name); +fdt_free_key (&pubkey);return -ENOMEM ; }
@@ -108,10 +154,11 @@ static int read_key_from_fdt(struct signer *ctx, const void *fdt, int node)if (!point) {fprintf (stderr,"Failed to allocate EC_POINT\n" );EC_KEY_free (ec_key); +fdt_free_key (&pubkey);return -ENOMEM ; } - len = pubkey.size_bits /8 ; + len =DIV_ROUND_UP (pubkey.size_bits,8 );uint8_t buf[1 + len *2 ];
@@ -123,6 +170,7 @@ static int read_key_from_fdt(struct signer *ctx, const void *fdt, int node)fprintf (stderr,"Failed to convert (x,y) point to EC_POINT\n" );EC_POINT_free (point);EC_KEY_free (ec_key); +fdt_free_key (&pubkey);return -EINVAL ; }
@@ -130,11 +178,13 @@ static int read_key_from_fdt(struct signer *ctx, const void *fdt, int node)fprintf (stderr,"Failed to set EC_POINT as public key\n" );EC_POINT_free (point);EC_KEY_free (ec_key); +fdt_free_key (&pubkey);return -EINVAL ; }fprintf (stderr,"Successfully loaded ECDSA key from FDT node %d\n" , node);EC_POINT_free (point); +fdt_free_key (&pubkey); ctx->ecdsa_key = ec_key;return 0 ;
lib/ecdsa/ecdsa-verify.c +57 -7
123 lines not on this page · raw message
lib/fdt-libcrypto.c +1 -1
@@ -10,7 +10,7 @@int fdt_add_bignum (void *blob,int noffset,const char *prop_name,BIGNUM *num,int num_bits) { -int nwords = num_bits /32 ; +int nwords = (num_bits +31 ) /32 ;int size;uint32_t *buf, *ptr;BIGNUM *tmp, *big2, *big32, *big2_32;
tools/image-sig-host.c +7 -0
@@ -83,6 +83,13 @@ struct crypto_algo crypto_algos[] = { .add_verify_data = ecdsa_add_verify_data, .verify = ecdsa_verify, }, + { + .name = "ecdsa521", + .key_len = ECDSA521_BYTES, + .sign = ecdsa_sign, + .add_verify_data = ecdsa_add_verify_data, + .verify = ecdsa_verify, + }, { .name = "secp521r1", .key_len = ECDSA521_BYTES,
Signature · 1 line
2.43.0
Re: [PATCH v4 05/14] ecdsa: fix support of secp521r1
Hi Philippe,
Quoted 17 lines · Philippe Reynes
ecdsa: fix support of secp521r1
Current implementation of ecdsa only supports key len aligned on 8 bits. But the curve secp521r1 uses a key of 521 bits which is not aligned on 8 bits. In this commit, we update the keys management for ecdsa to support keys that are not aligned on 8 bits.
Signed-off-by Philippe Reynes <[email protected]>
lib/ecdsa/ecdsa-libcrypto.c| 54 ++++++++++++++++++++++++++++++++++++--lib/ecdsa/ecdsa-verify.c | 64 ++++++++++++++++++++++++++++++++++++++++----- lib/fdt-libcrypto.c | 2 +- tools/image-sig-host.c | 7 +++++ 4 files changed, 117 insertions(+), 10 deletions(-)
lib/ecdsa/ecdsa-verify.c static int ecdsa_verify_hash(struct udevice *dev, · line 129
Quoted 9 lines
lib/ecdsa/ecdsa-verify.c +9
-0@@ -87,15 +121,19 @@ static int ecdsa_verify_hash(struct udevice *dev, + ret = ops->verify (dev, &key, hash, algo->checksum_len, + sig, sig_len); + +/* On success, don't worry about remaining keys */ +if (!ret) { +fdt_free_key (&key); +return 0 ; + } + }
When ops->verify() returns non-zero, the loop continues but does not call fdt_free_key(), leaking memory allocated by memdup() for each failed attempt. Please can you add fdt_free_key(&key) for the failure case.
lib/ecdsa/ecdsa-verify.c static int fdt_get_key(struct ecdsa_public_key *key, const void *fdt, int node) · line 61
Quoted 7 lines
lib/ecdsa/ecdsa-verify.c +5
-0@@ -50,15 +57,37 @@ static int fdt_get_key(struct ecdsa_public_key *key, const void *fdt, int node) + x =memdup ((char *)key->x + (x_len - expected_len), expected_len); + key->x = (const uint8_t *)x; + + y =memdup ((char *)key->y + (y_len - expected_len), expected_len); + key->y = (const uint8_t *)y;
The memdup() calls are not checked for allocation failure. If x succeeds but y fails, x is leaked. Please can you check return values and return -ENOMEM on failure.
lib/ecdsa/ecdsa-libcrypto.c static int fdt_get_key(struct ecdsa_public_key *key, const void *fdt, int node) · line 87
Quoted 7 lines
lib/ecdsa/ecdsa-libcrypto.c +5
-0@@ -63,12 +83,34 @@ static int fdt_get_key(struct ecdsa_public_key *key, const void *fdt, int node) + x =memdup ((char *)key->x + (x_len - expected_len), expected_len); + key->x = (const uint8_t *)x; + + y =memdup ((char *)key->y + (y_len - expected_len), expected_len); + key->y = (const uint8_t *)y;
Same issue here - missing error handling for memdup() failures.
Regards,
Simon
Re: [PATCH v4 05/14] ecdsa: fix support of secp521r1
In reply to Philippe ReynesHi Philippe,
Quoted 82 lines · Philippe Reynes
Current implementation of ecdsa only supports key len aligned on 8 bits. But the curve secp521r1 uses a key of 521 bits which is not aligned on 8 bits. In this commit, we update the keys management for ecdsa to support keys that are not aligned on 8 bits.
Signed-off-by Philippe Reynes <[email protected]>---
v2:
- intitial version
v3:
- fix typo in comments
v4:
- fix commit message
- clean code with DIV_ROUND_UP-
- duplicate data before shifting
- support ecdsa521 and secp521r1
- clean codelib/ecdsa/ecdsa-libcrypto.c | 54 +++++++++++++++++++++++++++++-- lib/ecdsa/ecdsa-verify.c | 64 +++++++++++++++++++++++++++++++++---- lib/fdt-libcrypto.c | 2 +- tools/image-sig-host.c | 7 ++++ 4 files changed, 117 insertions(+), 10 deletions(-)lib/ecdsa/ecdsa-libcrypto.c +23
-1@@ -26,6 +26,8 @@#include <openssl/ec.h> #include <openssl/bn.h> +#define DIV_ROUND_UP (n, d) (((n) + (d) - 1) / (d)) +/* Image signing context for openssl-libcrypto */ struct signer {EVP_PKEY *evp_key;/* Pointer to EVP_PKEY object */ @@ -41,10 +43,26 @@ struct ecdsa_public_key {int size_bits; }; +static char *memdup (char *buf,size_t size) +{ +char *dup; + + dup =malloc (size); +if (dup) +memcpy (dup, buf, size); + +return dup; +} +static int fdt_get_key (struct ecdsa_public_key *key,const void *fdt,int node) { +const char *x; +const char *y;int x_len;int y_len; +int expected_len; + +memset (key,0 ,sizeof (*key)); key->curve_name =fdt_getprop (fdt, node,"ecdsa,curve" ,NULL );if (!key->curve_name)@@ -54,6 +72,8 @@ static int fdt_get_key(struct ecdsa_public_key *key, const void *fdt, int node) key->size_bits =256 ; else if (!strcmp(key->curve_name, "secp384r1")) key->size_bits =384 ; + else if (!strcmp(key->curve_name, "secp521r1")) + key->size_bits =521 ; else return -EINVAL;@@ -63,12 +83,34 @@ static int fdt_get_key(struct ecdsa_public_key *key, const void *fdt, int node)if (!key->x || !key->y)return -EINVAL ; -if (x_len != key->size_bits /8 || y_len != key->size_bits /8 ) +/* +* The public key is stored as an array of u32, so if the key size is +* not a multiple of 32 (for example 521), we may have extra bytes.
lib/ecdsa/ecdsa-libcrypto.c static int fdt_get_key(struct ecdsa_public_key *key, const void *fdt, int node) · line 98
Quoted 10 lines
lib/ecdsa/ecdsa-libcrypto.c +8
-0+* To avoid any issue later, we shift the x and y pointer to the first +* useful byte. +*/ + expected_len =DIV_ROUND_UP (key->size_bits,8 ); + +if (x_len < expected_len || y_len < expected_len)return -EINVAL ; + x =memdup ((char *)key->x + (x_len - expected_len), expected_len); + key->x = (const uint8_t *)x;
memdup() result for x is not checked before assigning it to key->x.
lib/ecdsa/ecdsa-libcrypto.c static int fdt_get_key(struct ecdsa_public_key *key, const void *fdt, int node) · line 102
Quoted 4 lines
lib/ecdsa/ecdsa-libcrypto.c +4
-0+ + y =memdup ((char *)key->y + (y_len - expected_len), expected_len); + key->y = (const uint8_t *)y; +
Ditto.
Quoted 114 lines
lib/ecdsa/ecdsa-libcrypto.c +17
-1return 0 ; } +static void fdt_free_key (struct ecdsa_public_key *key) +{ +if (!key) +return ; +free ((char *)key->x); +free ((char *)key->y); +} +static int read_key_from_fdt (struct signer *ctx,const void *fdt,int node) {struct ecdsa_public_key pubkey;@@ -89,8 +131,11 @@ static int read_key_from_fdt(struct signer *ctx, const void *fdt, int node) nid = NID_X9_62_prime256v1; }else if (!strcmp (pubkey.curve_name,"secp384r1" )) { nid = NID_secp384r1; + }else if (!strcmp (pubkey.curve_name,"secp521r1" )) { + nid = NID_secp521r1; }else {fprintf (stderr,"Unsupported curve name: '%s'\n" , pubkey.curve_name); +fdt_free_key (&pubkey);return -EINVAL ; }@@ -100,6 +145,7 @@ static int read_key_from_fdt(struct signer *ctx, const void *fdt, int node) ec_key =EC_KEY_new_by_curve_name (nid);if (!ec_key) {fprintf (stderr,"Failed to allocate EC_KEY for curve %s\n" , pubkey.curve_name); +fdt_free_key (&pubkey);return -ENOMEM ; }@@ -108,10 +154,11 @@ static int read_key_from_fdt(struct signer *ctx, const void *fdt, int node)if (!point) {fprintf (stderr,"Failed to allocate EC_POINT\n" );EC_KEY_free (ec_key); +fdt_free_key (&pubkey);return -ENOMEM ; } - len = pubkey.size_bits /8 ; + len =DIV_ROUND_UP (pubkey.size_bits,8 );uint8_t buf[1 + len *2 ];@@ -123,6 +170,7 @@ static int read_key_from_fdt(struct signer *ctx, const void *fdt, int node)fprintf (stderr,"Failed to convert (x,y) point to EC_POINT\n" );EC_POINT_free (point);EC_KEY_free (ec_key); +fdt_free_key (&pubkey);return -EINVAL ; }@@ -130,11 +178,13 @@ static int read_key_from_fdt(struct signer *ctx, const void *fdt, int node)fprintf (stderr,"Failed to set EC_POINT as public key\n" );EC_POINT_free (point);EC_KEY_free (ec_key); +fdt_free_key (&pubkey);return -EINVAL ; }fprintf (stderr,"Successfully loaded ECDSA key from FDT node %d\n" , node);EC_POINT_free (point); +fdt_free_key (&pubkey); ctx->ecdsa_key = ec_key;return 0 ;lib/ecdsa/ecdsa-verify.c +15
-2@@ -10,6 +10,7 @@#include <crypto/ecdsa-uclass.h> #include <dm/uclass.h> +#include <malloc.h> #include <u-boot/ecdsa.h> /* @@ -24,13 +25,19 @@ static int ecdsa_key_size(const char *curve_name)return 256 ; else if (!strcmp(curve_name, "secp384r1"))return 384 ; + else if (!strcmp(curve_name, "secp521r1")) +return 521 ;return 0 ; }static int fdt_get_key (struct ecdsa_public_key *key,const void *fdt,int node) { -int x_len, y_len; +int expected_len, x_len, y_len; +const char *x; +const char *y; + +memset (key,0 ,sizeof (*key)); key->curve_name =fdt_getprop (fdt, node,"ecdsa,curve" ,NULL );if (!key->curve_name) {@@ -50,15 +57,37 @@ static int fdt_get_key(struct ecdsa_public_key *key, const void *fdt, int node)if (!key->x || !key->y)return -EINVAL ; -if (x_len != (key->size_bits /8 ) || y_len != (key->size_bits /8 )) { +/* +* The public key is stored as an array of u32, so if the key size is +* not a multiple of 32 (for example 521), we may have extra bytes. +* To avoid any issue later, we shift the x and y pointer to the first +* useful byte. +*/ + expected_len =DIV_ROUND_UP (key->size_bits,8 );
lib/ecdsa/ecdsa-verify.c static int fdt_get_key(struct ecdsa_public_key *key, const void *fdt, int node) · line 76
Quoted 10 lines
lib/ecdsa/ecdsa-verify.c +5
-0+ +if (x_len < expected_len || y_len < expected_len) {printf ("%s: node=%d, curve@%p x@%p+%i y@%p+%i\n" , __func__, node, key->curve_name, key->x, x_len, key->y, y_len);return -EINVAL ; } + x =memdup ((char *)key->x + (x_len - expected_len), expected_len); + key->x = (const uint8_t *)x; +
Ditto.
lib/ecdsa/ecdsa-verify.c static int fdt_get_key(struct ecdsa_public_key *key, const void *fdt, int node) · line 78
Quoted 2 lines
lib/ecdsa/ecdsa-verify.c +2
-0+ y =memdup ((char *)key->y + (y_len - expected_len), expected_len); + key->y = (const uint8_t *)y;
Ditto.
Quoted 44 lines
lib/ecdsa/ecdsa-verify.c +20
-4+return 0 ; } +static void fdt_free_key (struct ecdsa_public_key *key) +{ +if (!key) +return ; +free ((char *)key->x); +free ((char *)key->y); +} +static int ecdsa_verify_hash (struct udevice *dev,const struct image_sign_info *info,const void *hash,const void *sig,uint sig_len)@@ -73,11 +102,16 @@ static int ecdsa_verify_hash(struct udevice *dev,if (info->required_keynode >0 ) { ret =fdt_get_key (&key, info->fdt_blob, info->required_keynode); -if (ret <0 ) +if (ret <0 ) { +fdt_free_key (&key);return ret; + } -return ops->verify (dev, &key, hash, algo->checksum_len, - sig, sig_len); + ret = ops->verify (dev, &key, hash, algo->checksum_len, + sig, sig_len); +fdt_free_key (&key); + +return ret; } sig_node =fdt_subnode_offset (info->fdt_blob,0 ,FIT_SIG_NODENAME );@@ -87,15 +121,19 @@ static int ecdsa_verify_hash(struct udevice *dev,/* Try all possible keys under the "/signature" node */ fdt_for_each_subnode (key_node, info->fdt_blob, sig_node) { ret =fdt_get_key (&key, info->fdt_blob, key_node); -if (ret <0 ) +if (ret <0 ) { +fdt_free_key (&key);continue ; + }
lib/ecdsa/ecdsa-verify.c static int ecdsa_verify_hash(struct udevice *dev, · line 136
Quoted 10 lines
lib/ecdsa/ecdsa-verify.c +3
-1ret = ops->verify (dev, &key, hash, algo->checksum_len, sig, sig_len);/* On success, don't worry about remaining keys */ -if (!ret) +if (!ret) { +fdt_free_key (&key);return 0 ; + }
fdt_free_key(&key) is called only on successful verification. Failed verification leaks the copied x and y buffers.
Regards,
Raymond
Quoted 56 lines
lib/ecdsa/ecdsa-verify.c +12
-0}return -EPERM ;@@ -135,6 +173,18 @@ U_BOOT_CRYPTO_ALGO(ecdsa384) = { .verify = ecdsa_verify, }; +U_BOOT_CRYPTO_ALGO (ecdsa521) = { + .name ="ecdsa521" , + .key_len =ECDSA521_BYTES , + .verify = ecdsa_verify, +}; + +U_BOOT_CRYPTO_ALGO (secp521r1) = { + .name ="secp521r1" , + .key_len =ECDSA521_BYTES , + .verify = ecdsa_verify, +}; +/* * uclass definition for ECDSA API * lib/fdt-libcrypto.c +1
-1@@ -10,7 +10,7 @@int fdt_add_bignum (void *blob,int noffset,const char *prop_name,BIGNUM *num,int num_bits) { -int nwords = num_bits /32 ; +int nwords = (num_bits +31 ) /32 ;int size;uint32_t *buf, *ptr;BIGNUM *tmp, *big2, *big32, *big2_32;tools/image-sig-host.c +7
-1@@ -83,6 +83,13 @@ struct crypto_algo crypto_algos[] = { .add_verify_data = ecdsa_add_verify_data, .verify = ecdsa_verify, }, + { + .name = "ecdsa521", + .key_len = ECDSA521_BYTES, + .sign = ecdsa_sign, + .add_verify_data = ecdsa_add_verify_data, + .verify = ecdsa_verify, + }, { .name = "secp521r1", .key_len = ECDSA521_BYTES, --2.43.0
PATCH v4 6/14 test: dm: ecdsa.c: clean this test as software ecdsa is now implemented
In reply to Philippe ReynesThe test ecdsa was done when ecdsa was only supported by hardware. So it wasn't possible to test ecdsa on sandbox, and there is a test to check that ecdsa is not supported on sandbox.
Now, there is a software implementation of ecdsa. So we remove this outdated test.
---
v2:
- initial version
v3:
- no change
v4:
- add a test that use ecdsa_verify
test/dm/ecdsa.c | 104 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 94 insertions(+), 10 deletions(-)
test/dm/ecdsa.c +94 -10
@@ -3,36 +3,120 @@#include <crypto/ecdsa-uclass.h> #include <dm.h> #include <dm/test.h> +#include <malloc.h> #include <test/ut.h> #include <u-boot/ecdsa.h> +#define CHECK (op) ({ \ + int err = op; \ + if (err < 0) { \ + printf("%s: %s: %s\n", __func__, #op, \ + fdt_strerror(err)); \ + return err; \ + } \ + \ + err; \ + }) + +static int set_fdt_ecdsa_point (char *fdt,char *name,const char *data,size_t len) +{ +char *value =NULL ; +int ret =0 ; + +if (!fdt || !name || !data) { + ret = -EINVAL ; + goto out; + } + + value =malloc (len /2 ); +if (!value) { + ret = -EINVAL ; + goto out; + } + + ret =hex2bin (value, data, len /2 ); +if (ret) + goto out; + + ret =fdt_property (fdt, name, value, len /2 ); +if (ret) + goto out; + + out: +free (value); +return ret; +} + +static int create_fdt_with_ecdsa_key (char *fdt,size_t size, +const char *name,const char *curve, +const char *x,const char *y) +{ +CHECK (fdt_create (fdt, size)); +CHECK (fdt_finish_reservemap (fdt)); +CHECK (fdt_begin_node (fdt,"" )); +CHECK (fdt_begin_node (fdt,"signature" )); +CHECK (fdt_begin_node (fdt, name)); +CHECK (fdt_property_string (fdt,"algo" ,"sha256,ecdsa256" )); +CHECK (set_fdt_ecdsa_point (fdt,"ecdsa,y-point" , y,strlen (y))); +CHECK (set_fdt_ecdsa_point (fdt,"ecdsa,x-point" , x,strlen (x))); +CHECK (fdt_property_string (fdt,"ecdsa,curve" , curve)); +CHECK (fdt_property_string (fdt,"key-name-hint" , name)); +CHECK (fdt_end_node (fdt));/* name */ +CHECK (fdt_end_node (fdt));/* "signature" */ +CHECK (fdt_end_node (fdt));/* "" */ +CHECK (fdt_finish (fdt)); +CHECK (fdt_pack (fdt)); + +return 0 ; +} +/* * Basic test of the ECDSA uclass and ecdsa_verify() * -* ECDSA implementations in u-boot are hardware-dependent. Until we have a -* software implementation that can be compiled into the sandbox, all we can -* test is the uclass support. +* ECDSA software implementation is tested in another test, +* so we only check that the class UCLASS_ECDSA may be used. * -* The uclass_get() test is redundant since ecdsa_verify() would also fail. We -* run both functions in order to isolate the cause more clearly. i.e. is -* ecdsa_verify() failing because the UCLASS is absent/broken? +* The data used in this test come from RFC6979 */ static int dm_test_ecdsa_verify (struct unit_test_state *uts) {struct uclass *ucp; +const char *full_name ="sha256,secp256r1" ; +const char *name ="key-ecdsa-256" ; +const char *curve ="prime256v1" ; +const char *x ="60FED4BA255A9D31C961EB74C6356D68C049B8923B61FA6CE669622E60F29FB6" ; +const char *y ="7903FE1008B8BC99A41AE9E95628BC64F2F1B20C2D7E9F5177A3C294D4462299" ; +const char *r ="EFD48B2AACB6A8FD1140DD9CD45E81D69D2C877B56AAF991C34D0EA84EAF3716" ; +const char *s ="F7CB1C942D657C41D436C7A1B6E29F65F3E900DBB9AFF4064DC4AB2F843ACDA8" ; +uint8_t sig[64 ]; +size_t fdt_size =512 ; +char fdt[512 ]; -struct checksum_algo algo = { - .checksum_len =256 , +struct image_region region[] = { + { + .data ="sample" , + .size =strlen ("sample" ), + }, };struct image_sign_info info = { - .checksum = &algo, + .checksum =image_get_checksum_algo (full_name), + .crypto =image_get_crypto_algo (full_name), + .fdt_blob = fdt, }; +/* create a fdt with the public key */ +ut_asserteq (0 ,create_fdt_with_ecdsa_key (fdt, fdt_size, name, curve, x, y)); + +/* prepare the signature */ +ut_asserteq (0 ,hex2bin (sig +0 , r,strlen (r) /2 )); +ut_asserteq (0 ,hex2bin (sig +32 , s,strlen (s) /2 )); +ut_assertok (uclass_get (UCLASS_ECDSA , &ucp));ut_assertnonnull (ucp); -ut_asserteq (-ENODEV ,ecdsa_verify (&info,NULL ,0 ,NULL ,0 )); +ut_asserteq (0 ,ecdsa_verify (&info, region,1 , sig,sizeof (sig)));return 0 ; } +DM_TEST (dm_test_ecdsa_verify,UTF_SCAN_PDATA |UTF_SCAN_FDT );
Signature · 1 line
2.43.0
Re: [PATCH v4 06/14] test: dm: ecdsa.c: clean this test as software ecdsa is now implemented
Hi Philippe,
Quoted 15 lines · Philippe Reynes
test: dm:
ecdsa.c: clean this test as software ecdsa is now implementedThe test ecdsa was done when ecdsa was only supported by hardware. So it wasn't possible to test ecdsa on sandbox, and there is a test to check that ecdsa is not supported on sandbox.
Now, there is a software implementation of ecdsa. So we remove this outdated test.Signed-off-by Philippe Reynes <[email protected]>
test/dm/ecdsa.c| 104 ++++++++++++++++++++++++++++++++++++++++++++++++++------1 file changed, 94 insertions(+), 10 deletions(-)
test/dm/ecdsa.c line 7
Quoted 5 lines
test/dm/ecdsa.c +5
-0@@ -3,36 +3,120 @@ +struct image_sign_info info = { + .checksum =image_get_checksum_algo (full_name), + .crypto =image_get_crypto_algo (full_name), + .fdt_blob = fdt, + };
If the crypto algo name is invalid, info.crypto will be NULL - please can you add ut_assertnonnull() checks for both checksum and crypto to catch this earlier?
Regards,
Simon
PATCH v4 7/14 test: py: vboot: prepare integration test for ecdsa
In reply to Philippe ReynesThe vboot tests only consider rsa algo for signature. To prepare the integration of ecdsa test, the signature algo is now explicit.
---
v2:
- initial version
v3:
- no change
v4:
- no change
test/py/tests/test_fit_ecdsa.py | 2 +-
test/py/tests/test_vboot.py | 99 ++++++++++---------
....its => sign-configs-sha1-rsa2048-pss.its} | 0
...sha1.its => sign-configs-sha1-rsa2048.its} | 0
... sign-configs-sha256-rsa2048-pss-prod.its} | 0
...ts => sign-configs-sha256-rsa2048-pss.its} | 0
...56.its => sign-configs-sha256-rsa2048.its} | 0
...84.its => sign-configs-sha384-rsa3072.its} | 0
...s.its => sign-images-sha1-rsa2048-pss.its} | 0
...-sha1.its => sign-images-sha1-rsa2048.its} | 0
...its => sign-images-sha256-rsa2048-pss.its} | 0
...256.its => sign-images-sha256-rsa2048.its} | 0
...384.its => sign-images-sha384-rsa3072.its} | 0
13 files changed, 51 insertions(+), 50 deletions(-)
rename test/py/tests/vboot/{sign-configs-sha1-pss.its => sign-configs-sha1-rsa2048-pss.its} (100%)
rename test/py/tests/vboot/{sign-configs-sha1.its => sign-configs-sha1-rsa2048.its} (100%)
rename test/py/tests/vboot/{sign-configs-sha256-pss-prod.its => sign-configs-sha256-rsa2048-pss-prod.its} (100%)
rename test/py/tests/vboot/{sign-configs-sha256-pss.its => sign-configs-sha256-rsa2048-pss.its} (100%)
rename test/py/tests/vboot/{sign-configs-sha256.its => sign-configs-sha256-rsa2048.its} (100%)
rename test/py/tests/vboot/{sign-configs-sha384.its => sign-configs-sha384-rsa3072.its} (100%)
rename test/py/tests/vboot/{sign-images-sha1-pss.its => sign-images-sha1-rsa2048-pss.its} (100%)
rename test/py/tests/vboot/{sign-images-sha1.its => sign-images-sha1-rsa2048.its} (100%)
rename test/py/tests/vboot/{sign-images-sha256-pss.its => sign-images-sha256-rsa2048-pss.its} (100%)
rename test/py/tests/vboot/{sign-images-sha256.its => sign-images-sha256-rsa2048.its} (100%)
rename test/py/tests/vboot/{sign-images-sha384.its => sign-images-sha384-rsa3072.its} (100%)test/py/tests/test_fit_ecdsa.py +1 -1
@@ -102,7 +102,7 @@ def test_fit_ecdsa(ubman): with open(key_file, 'w') as f: f.write(key.export_key(format='PEM')) - assemble_fit_image(fit_file, f'{datadir}/sign-images-sha256.its', tempdir) + assemble_fit_image(fit_file, f'{datadir}/sign-images-sha256-rsa2048.its', tempdir) fit = SignableFitImage(ubman, fit_file) nodes = fit.find_signable_image_nodes()
test/py/tests/test_vboot.py +50 -49
198 lines not on this page · raw message
test/py/tests/vboot/sign-configs-sha1-rsa2048-pss.its renamed from test/py/tests/vboot/sign-configs-sha1-pss.its +0 -0
test/py/tests/vboot/sign-configs-sha1-rsa2048.its renamed from test/py/tests/vboot/sign-configs-sha1.its +0 -0
test/py/tests/vboot/sign-configs-sha256-rsa2048-pss-prod.its renamed from test/py/tests/vboot/sign-configs-sha256-pss-prod.its +0 -0
test/py/tests/vboot/sign-configs-sha256-rsa2048-pss.its renamed from test/py/tests/vboot/sign-configs-sha256-pss.its +0 -0
test/py/tests/vboot/sign-configs-sha256-rsa2048.its renamed from test/py/tests/vboot/sign-configs-sha256.its +0 -0
test/py/tests/vboot/sign-configs-sha384-rsa3072.its renamed from test/py/tests/vboot/sign-configs-sha384.its +0 -0
test/py/tests/vboot/sign-images-sha1-rsa2048-pss.its renamed from test/py/tests/vboot/sign-images-sha1-pss.its +0 -0
test/py/tests/vboot/sign-images-sha1-rsa2048.its renamed from test/py/tests/vboot/sign-images-sha1.its +0 -0
test/py/tests/vboot/sign-images-sha256-rsa2048-pss.its renamed from test/py/tests/vboot/sign-images-sha256-pss.its +0 -0
test/py/tests/vboot/sign-images-sha256-rsa2048.its renamed from test/py/tests/vboot/sign-images-sha256.its +0 -0
test/py/tests/vboot/sign-images-sha384-rsa3072.its renamed from test/py/tests/vboot/sign-images-sha384.its +0 -0
Signature · 1 line
2.43.0
PATCH v4 8/14 test: vboot: add test for ecdsa
In reply to Philippe ReynesThis commit adds test case for ecdsa on fit, but not (yet) for the global image signature (preload).
---
v2:
- initial version
v3:
- no change
v4:
- no change
test/py/tests/test_vboot.py | 29 ++++++++++++ .../vboot/sign-configs-sha256-ecdsa256.its | 45 +++++++++++++++++++ .../vboot/sign-configs-sha256-ecdsa384.its | 45 +++++++++++++++++++ .../vboot/sign-configs-sha256-ecdsa521.its | 45 +++++++++++++++++++ .../vboot/sign-images-sha256-ecdsa256.its | 42 +++++++++++++++++ .../vboot/sign-images-sha256-ecdsa384.its | 42 +++++++++++++++++ .../vboot/sign-images-sha256-ecdsa521.its | 42 +++++++++++++++++ 7 files changed, 290 insertions(+) create mode 100644 test/py/tests/vboot/sign-configs-sha256-ecdsa256.its create mode 100644 test/py/tests/vboot/sign-configs-sha256-ecdsa384.its create mode 100644 test/py/tests/vboot/sign-configs-sha256-ecdsa521.its create mode 100644 test/py/tests/vboot/sign-images-sha256-ecdsa256.its create mode 100644 test/py/tests/vboot/sign-images-sha256-ecdsa384.its create mode 100644 test/py/tests/vboot/sign-images-sha256-ecdsa521.its
test/py/tests/test_vboot.py +29 -0
@@ -94,6 +94,9 @@ TESTDATA_IN = [ ['sha256-pss-pad', 'sha256', '-rsa2048', '-pss', '-E -p 0x10000', False, False, False, False], ['sha256-pss-required', 'sha256', '-rsa2048', '-pss', None, True, False, False, False], ['sha256-pss-pad-required', 'sha256', '-rsa2048', '-pss', '-E -p 0x10000', True, True, False, False], + ['sha256-basic-ecdsa256', 'sha256', '-ecdsa256', '', None, False, False, False, False], + ['sha256-basic-ecdsa384', 'sha256', '-ecdsa384', '', None, False, False, False, False], + ['sha256-basic-ecdsa521', 'sha256', '-ecdsa521', '', None, False, False, False, False], ['sha384-basic', 'sha384', '-rsa3072', '', None, False, False, False, False], ['sha384-pad', 'sha384', '-rsa3072', '', '-E -p 0x10000', False, False, False, False], ['algo-arg', 'algo-arg', '', '', '-o sha256,rsa2048', False, False, True, False],
@@ -287,6 +290,29 @@ def test_vboot(ubman, name, sha_algo, sig_algo, padding, sign_options, required, utils.run_and_log(ubman, 'openssl req -batch -new -x509 -key %s%s.key ' '-out %s%s.crt' % (tmpdir, name, tmpdir, name)) + def create_ecdsa_pair(name): + """Generate a new ECDSA key pair + + Args: + name: Name of the key (e.g. 'dev') + """ + + if sig_algo == "-ecdsa256": + curve_name = "secp256r1" + elif sig_algo == "-ecdsa384": + curve_name = "secp384r1" + elif sig_algo == "-ecdsa521": + curve_name = "secp521r1" + else: + curve_name = "unknownCurve" + + utils.run_and_log(ubman, 'openssl ecparam -name %s -genkey -noout -out %s%s.pem' % + (curve_name, tmpdir, name)) + + # Create a certificate containing the public key + utils.run_and_log(ubman, 'openssl req -batch -new -x509 -key %s%s.pem ' + '-out %s%s.crt' % (tmpdir, name, tmpdir, name)) + def test_with_algo(sha_algo, sig_algo, padding, sign_options): """Test verified boot with the given hash algorithm.
@@ -537,6 +563,9 @@ def test_vboot(ubman, name, sha_algo, sig_algo, padding, sign_options, required, if sig_algo == "-rsa2048" or sig_algo == "-rsa3072" or sig_algo == "": create_rsa_pair('dev') create_rsa_pair('prod') + elif sig_algo == "-ecdsa256" or sig_algo == "-ecdsa384" or sig_algo == "-ecdsa521": + create_ecdsa_pair('dev') + create_ecdsa_pair('prod') # Create a number kernel image with zeroes with open('%stest-kernel.bin' % tmpdir, 'wb') as fd:
test/py/tests/vboot/sign-configs-sha256-ecdsa256.its new file +45 -0
45 lines not on this page · raw message
test/py/tests/vboot/sign-configs-sha256-ecdsa384.its new file +45 -0
45 lines not on this page · raw message
test/py/tests/vboot/sign-configs-sha256-ecdsa521.its new file +45 -0
45 lines not on this page · raw message
test/py/tests/vboot/sign-images-sha256-ecdsa256.its new file +42 -0
42 lines not on this page · raw message
test/py/tests/vboot/sign-images-sha256-ecdsa384.its new file +42 -0
42 lines not on this page · raw message
test/py/tests/vboot/sign-images-sha256-ecdsa521.its new file +42 -0
42 lines not on this page · raw message
Signature · 1 line
2.43.0
PATCH v4 9/14 tools: mkimage: pre-load: add support of ecdsa
In reply to Philippe ReynesRight now, mkimage can only create pre-load header using rsa. We add the support of ecdsa.
---
v3:
- initial version
v4:
- use pre_load_noffset (do not compute it again)
- release memory allocated with strdup
- clean code
lib/ecdsa/ecdsa-libcrypto.c | 29 ++++++++++---- tools/image-host.c | 79 +++++++++++++++++++++++++++++++------ 2 files changed, 90 insertions(+), 18 deletions(-)
lib/ecdsa/ecdsa-libcrypto.c +22 -7
@@ -496,14 +496,9 @@ int ecdsa_verify(struct image_sign_info *info,return ret; } -static int do_add (struct signer *ctx,void *fdt,const char *key_node_name, -struct image_sign_info *info) +static int search_key_node (void *fdt,const char *key_node_name) { -int signature_node, key_node, ret, key_bits; -const char *curve_name; -const EC_GROUP *group; -const EC_POINT *point; -BIGNUM *x, *y; +int signature_node, key_node; signature_node =fdt_subnode_offset (fdt,0 ,FIT_SIG_NODENAME );if (signature_node == -FDT_ERR_NOTFOUND ) {
@@ -538,6 +533,26 @@ static int do_add(struct signer *ctx, void *fdt, const char *key_node_name,return key_node; } +return key_node; +} + +static int do_add (struct signer *ctx,void *fdt,const char *key_node_name, +struct image_sign_info *info) +{ +int key_node, ret, key_bits; +const char *curve_name; +const EC_GROUP *group; +const EC_POINT *point; +BIGNUM *x, *y; + +if (info->required_keynode >0 ) { + key_node = info->required_keynode; + }else { + key_node =search_key_node (fdt, key_node_name); +if (key_node <0 ) +return key_node; + } + group =EC_KEY_get0_group (ctx->ecdsa_key); key_bits =EC_GROUP_order_bits (group); curve_name =OBJ_nid2sn (EC_GROUP_get_curve_name (group));
tools/image-host.c +68 -11
104 lines not on this page · raw message
Signature · 1 line
2.43.0
Re: [PATCH v4 09/14] tools: mkimage: pre-load: add support of ecdsa
Hi Philippe,
Quoted 13 lines · Philippe Reynes
tools: mkimage: pre-load: add support of ecdsa
Right now, mkimage can only create pre-load header using rsa. We add the support of ecdsa.
Signed-off-by Philippe Reynes <[email protected]>
lib/ecdsa/ecdsa-libcrypto.c| 29 +++++++++++++----tools/image-host.c | 79 ++++++++++++++++++++++++++++++++++++++------- 2 files changed, 90 insertions(+), 18 deletions(-)
lib/ecdsa/ecdsa-libcrypto.c static int do_add(struct signer *ctx, void *fdt, const char *key_node_name, · line 535
Quoted 3 lines
lib/ecdsa/ecdsa-libcrypto.c +3
-0@@ -538,6 +533,26 @@ static int do_add(struct signer *ctx, void *fdt, const char *key_node_name, +if (info->required_keynode >0 ) { + key_node = info->required_keynode; + }else {
Strictly speaking the check should be >= 0
Quoted 8 lines
tools/image-host.c +6
-0@@ -1244,13 +1245,61 @@ err_cert: +static int fit_pre_load_data_key_ecdsa (const char *keydir,void *keydest, +int pre_load_noffset,const void *key_name, +const void *algo_name) +{ +struct image_sign_info info; +int node, ret =0 ;
tools/image-host.c err_cert: · line 1260
Quoted 10 lines
tools/image-host.c +10
-0+ +memset (&info,0 ,sizeof (info)); + info.keydir = keydir; + info.keyname =strdup (key_name); + info.name =strdup (algo_name); + info.checksum =image_get_checksum_algo (algo_name); + info.crypto =image_get_crypto_algo (algo_name); + info.required_keynode = pre_load_noffset; + + node =ecdsa_add_verify_data (&info, keydest);
Please can you check for NULL returns from image_get_checksum_algo() and image_get_crypto_algo()? Otherwise ecdsa_add_verify_data() -> prepare_ctx() -> alloc_ctx() will dereference NULL
See fit_image_setup_sig_info() for an example.
Regards,
Simon
PATCH v4 10/14 tools: binman: pre-load: add support of ecdsa
In reply to Philippe ReynesRight now, binman can only create pre-load header
using rsa. We add the support of ecdsa.
---
v3:
- initial version
v4:
- merge patch 11 that was adding test for ecdsa pre-load
- add key size check
- use exc instead of simply e
- rename dts filaneme
- add a test to check key size
tools/binman/etype/pre_load.py | 76 +++++++++++++++++-- tools/binman/ftest.py | 50 ++++++++++++ tools/binman/test/ecdsa521.pem | 7 ++ tools/binman/test/security/pre_load_ecdsa.dts | 22 ++++++ .../security/pre_load_ecdsa_invalid_algo.dts | 22 ++++++ .../security/pre_load_ecdsa_invalid_key.dts | 22 ++++++ .../security/pre_load_ecdsa_invalid_sha.dts | 22 ++++++ 7 files changed, 213 insertions(+), 8 deletions(-) create mode 100644 tools/binman/test/ecdsa521.pem create mode 100644 tools/binman/test/security/pre_load_ecdsa.dts create mode 100644 tools/binman/test/security/pre_load_ecdsa_invalid_algo.dts create mode 100644 tools/binman/test/security/pre_load_ecdsa_invalid_key.dts create mode 100644 tools/binman/test/security/pre_load_ecdsa_invalid_sha.dts
tools/binman/etype/pre_load.py +68 -8
@@ -16,8 +16,10 @@ from binman.entry import EntryArg from Cryptodome.Hash import SHA256, SHA384, SHA512 from Cryptodome.PublicKey import RSA +from Cryptodome.PublicKey import ECC from Cryptodome.Signature import pkcs1_15 from Cryptodome.Signature import pss +from Cryptodome.Signature import DSS PRE_LOAD_MAGIC = b'UBSH'
@@ -27,6 +29,12 @@ RSAS = { 'rsa4096': 4096 / 8 } +ECDSAS = { + 'ecdsa256': 256 / 8 * 2, + 'ecdsa384': 384 / 8 * 2, + 'ecdsa521': 132 +} + SHAS = { 'sha256': SHA256, 'sha384': SHA384,
@@ -86,17 +94,10 @@ class Entry_pre_load(Entry_collection): if self.key_path is None: self.key_path = '' - def _CreateHeader(self): - """Create a pre load header""" - hash_name, sign_name = self.algo_name.split(',') - padding_name = self.padding_name - key_name = os.path.join(self.key_path, self.key_name) - + def _CreateHeaderRsa(self, hash_name, sign_name, padding_name, key_name): # Check hash and signature name/type if hash_name not in SHAS: self.Raise(hash_name + " is not supported") - if sign_name not in RSAS: - self.Raise(sign_name + " is not supported") # Read the key key = RSA.import_key(tools.read_file(key_name))
@@ -151,6 +152,65 @@ class Entry_pre_load(Entry_collection): return data + pad + def _CreateHeaderEcdsa(self, hash_name, sign_name, key_name): + # Check hash and signature name/type + if hash_name not in SHAS: + self.Raise(hash_name + " is not supported") + + # Read the key + key = ECC.import_key(tools.read_file(key_name)) + + # Check if the key has the expected size + if key.pointQ.size_in_bytes() * 2 != ECDSAS[sign_name]: + self.Raise("The key " + self.key_name + " don't have the expected size") + + # Compute the hash + hash_image = SHAS[hash_name].new() + hash_image.update(self.image) + + # Compute the signature + signer = DSS.new(key, 'fips-186-3') + sig = signer.sign(hash_image) + + hash_sig = SHA256.new() + hash_sig.update(sig) + + version = self.version + header_size = self.header_size + image_size = len(self.image) + ofs_img_sig = 64 + len(sig) + flags = 0 + reserved0 = 0 + reserved1 = 0 + + first_header = struct.pack('>4sIIIIIII32s', PRE_LOAD_MAGIC, + version, header_size, image_size, + ofs_img_sig, flags, reserved0, + reserved1, hash_sig.digest()) + + hash_first_header = SHAS[hash_name].new() + hash_first_header.update(first_header) + sig_first_header = signer.sign(hash_first_header) + + data = first_header + sig_first_header + sig + pad = bytearray(self.header_size - len(data)) + + return data + pad + + def _CreateHeader(self): + """Create a pre load header""" + hash_name, sign_name = self.algo_name.split(',') + padding_name = self.padding_name + key_name = os.path.join(self.key_path, self.key_name) + + if sign_name in RSAS: + return self._CreateHeaderRsa(hash_name, sign_name, padding_name, key_name) + + if sign_name in ECDSAS: + return self._CreateHeaderEcdsa(hash_name, sign_name, key_name) + + self.Raise(sign_name + " is not supported") + def ObtainContents(self): """Obtain a placeholder for the header contents""" # wait that the image is available
tools/binman/ftest.py +50 -0
56 lines not on this page · raw message
tools/binman/test/ecdsa521.pem new file +7 -0
@@ -0,0 +1,7 @@ +-----BEGIN EC PRIVATE KEY----- +MIHcAgEBBEIBM+CNnraGci2/mw1wPq44l2HccHnoBbdP3DiU6zqsBOq8IR8uegz2 +FLzWsjxcW7hwROCdEm6tW99wqsyPE25RZ3egBwYFK4EEACOhgYkDgYYABABu5bWV +aQ4EgnXFjojX9df3gBEBipphEEFAoG87GuoWBdlimFC8UEEXiKNU37w0wlJn4bG0 +8uOKwDqBk3uF+DrmZwB45lCSKkjdRWsJeDt+iEuFe2O/mbXoL4p5D8MM2OsDV5GT +srUbxhXq+T/i5lV7XXm2+tT/7zU8ZQce6WRufbd9KQ== +-----END EC PRIVATE KEY-----
tools/binman/test/security/pre_load_ecdsa.dts new file +22 -0
@@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + pre-load { + content = <&image>; + algo-name = "sha256,ecdsa521"; + key-name = "ecdsa521.pem"; + header-size = <4096>; + version = <0x11223344>; + }; + + image: blob-ext { + filename = "refcode.bin"; + }; + }; +};
tools/binman/test/security/pre_load_ecdsa_invalid_algo.dts new file +22 -0
@@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + pre-load { + content = <&image>; + algo-name = "sha256,ecdsa5210"; + key-name = "ecdsa521.pem"; + header-size = <4096>; + version = <0x11223344>; + }; + + image: blob-ext { + filename = "refcode.bin"; + }; + }; +};
tools/binman/test/security/pre_load_ecdsa_invalid_key.dts new file +22 -0
@@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + pre-load { + content = <&image>; + algo-name = "sha256,ecdsa384"; + key-name = "ecdsa521.pem"; + header-size = <4096>; + version = <0x11223344>; + }; + + image: blob-ext { + filename = "refcode.bin"; + }; + }; +};
tools/binman/test/security/pre_load_ecdsa_invalid_sha.dts new file +22 -0
@@ -0,0 +1,22 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + pre-load { + content = <&image>; + algo-name = "sha2560,ecdsa521"; + key-name = "ecdsa521.pem"; + header-size = <4096>; + version = <0x11223344>; + }; + + image: blob-ext { + filename = "refcode.bin"; + }; + }; +};
Signature · 1 line
2.43.0
Re: [PATCH v4 10/14] tools: binman: pre-load: add support of ecdsa
Hi Philippe,
Quoted 18 lines · Philippe Reynes
tools: binman: pre-load: add support of ecdsa
Right now, binman can only create pre-load header
using rsa. We add the support of ecdsa.Signed-off-by Philippe Reynes <[email protected]>
tools/binman/etype/pre_load.py| 76 +++++++++++++++++++---tools/binman/ftest.py | 50 ++++++++++++++ tools/binman/test/ecdsa521.pem | 7 ++ tools/binman/test/security/pre_load_ecdsa.dts | 22 +++++++ .../test/security/pre_load_ecdsa_invalid_algo.dts | 22 +++++++ .../test/security/pre_load_ecdsa_invalid_key.dts | 22 +++++++ .../test/security/pre_load_ecdsa_invalid_sha.dts | 22 +++++++ 7 files changed, 213 insertions(+), 8 deletions(-)
tools/binman/etype/pre_load.py RSAS = { · line 33
Quoted 5 lines
tools/binman/etype/pre_load.py +5
-0@@ -27,6 +29,12 @@ RSAS = { +ECDSAS = { + 'ecdsa256': 256 / 8 * 2, + 'ecdsa384': 384 / 8 * 2, + 'ecdsa521': 132 +}
For consistency, please can you use the same formula for ecdsa521? Something like (521 + 7) // 8 * 2 would make it clearer that 132 = ceil(521/8) * 2.
tools/binman/etype/pre_load.py class Entry_pre_load(Entry_collection): · line 162
Quoted 13 lines
tools/binman/etype/pre_load.py +11
-0@@ -151,6 +152,65 @@ class Entry_pre_load(Entry_collection): + def _CreateHeaderEcdsa(self, hash_name, sign_name, key_name): + # Check hash and signature name/type + if hash_name not in SHAS: + self.Raise(hash_name + " is not supported") + + # Read the key + key = ECC.import_key(tools.read_file(key_name)) + + # Check if the key has the expected size + if key.pointQ.size_in_bytes() * 2 != ECDSAS[sign_name]: + self.Raise("The key " + self.key_name + " don't have the expected size")
doesn't have
Also _CreateHeaderRsa() has the same issue.
tools/binman/ftest.py fdt fdtmap Extract the devicetree blob from the fdtmap · line 5905
Quoted 13 lines
tools/binman/ftest.py +11
-0@@ -5895,6 +5895,56 @@ fdt fdtmap Extract the devicetree blob from the fdtmap + def testPreLoadEcdsa(self): + """Test an image with a pre-load header using ecdsa key""" + entry_args = { + 'pre-load-key-path': os.path.join(self._binman_dir, 'test'), + } + data = self._DoReadFileDtb( + 'security/pre_load_ecdsa.dts', entry_args=entry_args, + extra_indirs=[os.path.join(self._binman_dir, 'test')])[0] + + image_fname = tools.get_output_filename('image.bin') + is_signed = self._CheckPreload(image_fname, self.TestFile("ecdsa521.pem"), "sha256,ecdsa521")
This line is quite long. Please can you break it across lines?
Also we should use single quotes for strings.
Regards,
Simon
PATCH v4 11/14 boot: pre-load: add support of ecdsa
In reply to Philippe ReynesRight now, u-boot can only boot image with a
pre-load header with rsa. We add the support
of ecdsa.
---
v3:
- initial version
v4:
- avoid calling image_get_crypto_algo several times
boot/image-pre-load.c | 56 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 45 insertions(+), 11 deletions(-)
boot/image-pre-load.c +45 -11
@@ -70,6 +70,17 @@ static int image_pre_load_sig_setup(struct image_sig_info *info) return 0; }#else + +static int is_ecdsa (struct crypto_algo *crypto) +{ +int ret =0 ; + +if (crypto && !strncmp (crypto->name,"ecdsa" ,strlen ("ecdsa" ))) + ret =1 ; + +return ret; +} +/* * This function gathers information about the signature check * that could be done before launching the image.
@@ -86,6 +97,7 @@ static int image_pre_load_sig_setup(struct image_sig_info *info)int key_len;int node, ret =0 ;char *sig_info_path =NULL ; +struct crypto_algo *crypto;if (!info) {log_err ("ERROR: info is NULL for image pre-load sig check\n" );
@@ -114,11 +126,24 @@ static int image_pre_load_sig_setup(struct image_sig_info *info) goto out; } - padding_name =fdt_getprop (gd_fdt_blob (), node, -IMAGE_PRE_LOAD_PROP_PADDING_NAME ,NULL ); -if (!padding_name) { -log_info ("INFO: no padding_name provided, so using pkcs-1.5\n" ); - padding_name ="pkcs-1.5" ; + crypto =image_get_crypto_algo (algo_name); +if (!crypto) { +printf ("ERROR: can't find a valid crypto algo from %s\n" , + (char *)algo_name); + ret = -EINVAL ; + goto out; + } + +if (is_ecdsa (crypto)) { + padding_name =NULL ; + }else { + padding_name =fdt_getprop (gd_fdt_blob (), node, +IMAGE_PRE_LOAD_PROP_PADDING_NAME , +NULL ); +if (!padding_name) { +log_info ("INFO: no padding_name provided, so using pkcs-1.5\n" ); + padding_name ="pkcs-1.5" ; + } } sig_size = fdt_getprop(gd_fdt_blob(), node,
@@ -129,12 +154,17 @@ static int image_pre_load_sig_setup(struct image_sig_info *info) goto out; } - key =fdt_getprop (gd_fdt_blob (), node, -IMAGE_PRE_LOAD_PROP_PUBLIC_KEY , &key_len); -if (!key) { -log_err ("ERROR: no key for image pre-load sig check\n" ); - ret = -EINVAL ; - goto out; +if (is_ecdsa (crypto)) { + key =NULL ; + key_len =0 ; + }else { + key =fdt_getprop (gd_fdt_blob (), node, +IMAGE_PRE_LOAD_PROP_PUBLIC_KEY , &key_len); +if (!key) { +log_err ("ERROR: no key for image pre-load sig check\n" ); + ret = -EINVAL ; + goto out; + } } info->algo_name = (char *)algo_name;
@@ -155,6 +185,10 @@ static int image_pre_load_sig_setup(struct image_sig_info *info) info->sig_info.crypto =image_get_crypto_algo (info->sig_info.name); info->sig_info.key = info->key; info->sig_info.keylen = info->key_len; +if (is_ecdsa (crypto)) { + info->sig_info.required_keynode = node; + info->sig_info.fdt_blob =gd_fdt_blob (); + } out:return ret;
Signature · 1 line
2.43.0
Re: [PATCH v4 11/14] boot: pre-load: add support of ecdsa
Hi Philippe,
Quoted 13 lines · Philippe Reynes
boot: pre-load: add support of ecdsa
Right now, u-boot can only boot image with a
pre-load header with rsa. We add the support
of ecdsa.Signed-off-by Philippe Reynes <[email protected]>
boot/image-pre-load.c| 56 +++++++++++++++++++++++++++++++++++++++++----------1 file changed, 45 insertions(+), 11 deletions(-)
boot/image-pre-load.c static int image_pre_load_sig_setup(struct image_sig_info *info) · line 78
Quoted 9 lines
boot/image-pre-load.c +9
-0@@ -70,6 +70,17 @@ static int image_pre_load_sig_setup(struct image_sig_info *info) +static int is_ecdsa (struct crypto_algo *crypto) +{ +int ret =0 ; + +if (crypto && !strncmp (crypto->name,"ecdsa" ,strlen ("ecdsa" ))) + ret =1 ; + +return ret; +}
This could be simplified to:
static bool is_ecdsa(struct crypto_algo *crypto)
{
return crypto && !strncmp(crypto->name, "ecdsa", 5);
}boot/image-pre-load.c static int image_pre_load_sig_setup(struct image_sig_info *info) · line 188
Quoted 6 lines
boot/image-pre-load.c +4
-0@@ -155,6 +185,10 @@ static int image_pre_load_sig_setup(struct image_sig_info *info) + info->sig_info.crypto =image_get_crypto_algo (info->sig_info.name); + info->sig_info.key = info->key; + info->sig_info.keylen = info->key_len; +if (is_ecdsa (crypto)) {
You already have the crypto pointer from the earlier image_get_crypto_algo() call. Please can you reuse it here instead of calling image_get_crypto_algo() again:
info->sig_info.crypto = crypto;
Regards,
Simon
PATCH v4 12/14 tools: preload_check_sign: add support of ecdsa
In reply to Philippe Reynesright now, the tool preload_check_sign may only
checks an image with a pre-load header with rsa.
We add the support of pre-load header with ecdsa.
---
v3:
- initial version
v4:
- free key to avoid mem leak
- fix error management (set ret before goto out)
tools/preload_check_sign.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
tools/preload_check_sign.c +29 -0
@@ -8,6 +8,9 @@* complete file. The tool preload_check_sign allows to verify and authenticate * a file starting with a preload header. */ + +#define OPENSSL_API_COMPAT 0x10101000L +#include <stdio.h> #include <unistd.h> #include <openssl/pem.h>
@@ -144,6 +147,32 @@ int main(int argc, char **argv) info.sig_info.key = info.key; info.sig_info.keylen = info.key_len; +/* For ecdsa key, we have to update some values */ +if (EVP_PKEY_id (pkey) ==EVP_PKEY_EC ) { +EC_KEY *ecdsa_key; +const EC_GROUP *group; + + ecdsa_key =EVP_PKEY_get1_EC_KEY (pkey); +if (!ecdsa_key) { +fprintf (stderr,"Can not extract ECDSA key\n" ); + ret =EXIT_FAILURE ; + goto out; + } + + group =EC_KEY_get0_group (ecdsa_key); +if (!group) { +fprintf (stderr,"Can not extract ECDSA group\n" ); +EC_KEY_free (ecdsa_key); + ret =EXIT_FAILURE ; + goto out; + } + + info.sig_info.keyfile = keyfile; + info.sig_size = (EC_GROUP_order_bits (group) +7 ) /8 *2 ; + +EC_KEY_free (ecdsa_key); + } +/* Check the signature */ image_pre_load_sig_set_info (&info); ret =image_pre_load_sig ((ulong )buffer);
Signature · 1 line
2.43.0
Re: [PATCH v4 12/14] tools: preload_check_sign: add support of ecdsa
Hi Philippe,
Quoted 13 lines · Philippe Reynes
tools:
preload_check_sign: add support of ecdsaright now, the tool
preload_check_signmay only
checks an image with a pre-load header with rsa.
We add the support of pre-load header with ecdsa.Signed-off-by Philippe Reynes <[email protected]>
tools/preload_check_sign.c| 29 +++++++++++++++++++++++++++++1 file changed, 29 insertions(+)
tools/preload_check_sign.c line 10
Quoted 3 lines
tools/preload_check_sign.c +2
-0@@ -8,6 +8,9 @@ +#define OPENSSL_API_COMPAT 0x10101000L +#include <stdio.h>
This patch uses EC_KEY, EC_GROUP etc. so can you add <openssl/ec.h> ?
Regards,
Simon
PATCH v4 13/14 test: py: vboot: prepare test for global signature with ecdsa
In reply to Philippe ReynesThe vboot tests only consider rsa for test with global signature. To prepare the integration of test with ecdsa test, the signature algo is now explicit.
---
v3:
- initial version
v4:
- no change
test/py/tests/test_vboot.py | 12 ++++++------
...binman-pss.dts => sandbox-binman-rsa2048-pss.dts} | 0
...sandbox-binman.dts => sandbox-binman-rsa2048.dts} | 0
...pss.dts => sandbox-u-boot-global-rsa2048-pss.dts} | 0
...-global.dts => sandbox-u-boot-global-rsa2048.dts} | 0
5 files changed, 6 insertions(+), 6 deletions(-)
rename test/py/tests/vboot/{sandbox-binman-pss.dts => sandbox-binman-rsa2048-pss.dts} (100%)
rename test/py/tests/vboot/{sandbox-binman.dts => sandbox-binman-rsa2048.dts} (100%)
rename test/py/tests/vboot/{sandbox-u-boot-global-pss.dts => sandbox-u-boot-global-rsa2048-pss.dts} (100%)
rename test/py/tests/vboot/{sandbox-u-boot-global.dts => sandbox-u-boot-global-rsa2048.dts} (100%)test/py/tests/test_vboot.py +6 -6
@@ -503,7 +503,7 @@ def test_vboot(ubman, name, sha_algo, sig_algo, padding, sign_options, required, dtb) run_bootm(sha_algo, 'multi required key', '', False) - def test_global_sign(sha_algo, padding, sign_options): + def test_global_sign(sha_algo, sig_algo, padding, sign_options): """Test global image signature with the given hash algorithm and padding. Args:
@@ -512,14 +512,14 @@ def test_vboot(ubman, name, sha_algo, sig_algo, padding, sign_options, required, rsa signature algorithm. """ - dtb = '%ssandbox-u-boot-global%s.dtb' % (tmpdir, padding) + dtb = '%ssandbox-u-boot-global%s%s.dtb' % (tmpdir, sig_algo, padding) ubman.config.dtb = dtb # Compile our device tree files for kernel and U-Boot. These are # regenerated here since mkimage will modify them (by adding a # public key) below. dtc('sandbox-kernel.dts', ubman, dtc_args, datadir, tmpdir, dtb) - dtc_options('sandbox-u-boot-global%s.dts' % padding, '-p 1024') + dtc_options('sandbox-u-boot-global%s%s.dts' % (sig_algo, padding), '-p 1024') # Build the FIT with dev key (keys NOT required). This adds the # signature into sandbox-u-boot.dtb, NOT marked 'required'.
@@ -528,11 +528,11 @@ def test_vboot(ubman, name, sha_algo, sig_algo, padding, sign_options, required, # Build the dtb for binman that define the pre-load header # with the global sigature. - dtc('sandbox-binman%s.dts' % padding, ubman, dtc_args, datadir, tmpdir, dtb) + dtc('sandbox-binman%s%s.dts' % (sig_algo, padding), ubman, dtc_args, datadir, tmpdir, dtb) # Run binman to create the final image with the not signed fit # and the pre-load header that contains the global signature. - run_binman('sandbox-binman%s.dtb' % padding) + run_binman('sandbox-binman%s%s.dtb' % (sig_algo, padding)) # Check that the signature is correctly verified by u-boot run_bootm(sha_algo, 'global image signature',
@@ -582,7 +582,7 @@ def test_vboot(ubman, name, sha_algo, sig_algo, padding, sign_options, required, try: ubman.config.dtb = dtb if global_sign: - test_global_sign(sha_algo, padding, sign_options) + test_global_sign(sha_algo, sig_algo, padding, sign_options) elif required: test_required_key(sha_algo, sig_algo, padding, sign_options) else:
test/py/tests/vboot/sandbox-binman-rsa2048-pss.dts renamed from test/py/tests/vboot/sandbox-binman-pss.dts +0 -0
test/py/tests/vboot/sandbox-binman-rsa2048.dts renamed from test/py/tests/vboot/sandbox-binman.dts +0 -0
test/py/tests/vboot/sandbox-u-boot-global-rsa2048-pss.dts renamed from test/py/tests/vboot/sandbox-u-boot-global-pss.dts +0 -0
test/py/tests/vboot/sandbox-u-boot-global-rsa2048.dts renamed from test/py/tests/vboot/sandbox-u-boot-global.dts +0 -0
Signature · 1 line
2.43.0
Re: [PATCH v4 13/14] test: py: vboot: prepare test for global signature with ecdsa
Quoted 6 lines · Philippe Reynes
test: py: vboot: prepare test for global signature with ecdsa
The vboot tests only consider rsa for test with global signature. To prepare the integration of test with ecdsa test, the signature algo is now explicit.
Quoted 8 lines
Signed-off-by Philippe Reynes <[email protected]>
test/py/tests/test_vboot.py| 12 ++++++------...sandbox-binman-pss.dts => sandbox-binman-rsa2048-pss.dts} | 0 .../vboot/{sandbox-binman.dts => sandbox-binman-rsa2048.dts} | 0 ...-global-pss.dts => sandbox-u-boot-global-rsa2048-pss.dts} | 0 ...x-u-boot-global.dts => sandbox-u-boot-global-rsa2048.dts} | 0 5 files changed, 6 insertions(+), 6 deletions(-)
PATCH v4 14/14 test: py: vboot: add test for global signature with ecdsa
In reply to Philippe ReynesAs now u-boot supports pre-load header with ecdsa, we add some tests to vboot with ecdsa pre-load header.
---
v3:
- initial version
v4:
- no change
test/py/tests/test_vboot.py | 3 +++ .../tests/vboot/sandbox-binman-ecdsa256.dts | 24 +++++++++++++++++ .../tests/vboot/sandbox-binman-ecdsa384.dts | 24 +++++++++++++++++ .../tests/vboot/sandbox-binman-ecdsa521.dts | 24 +++++++++++++++++ .../vboot/sandbox-u-boot-global-ecdsa256.dts | 27 +++++++++++++++++++ .../vboot/sandbox-u-boot-global-ecdsa384.dts | 27 +++++++++++++++++++ .../vboot/sandbox-u-boot-global-ecdsa521.dts | 27 +++++++++++++++++++ 7 files changed, 156 insertions(+) create mode 100644 test/py/tests/vboot/sandbox-binman-ecdsa256.dts create mode 100644 test/py/tests/vboot/sandbox-binman-ecdsa384.dts create mode 100644 test/py/tests/vboot/sandbox-binman-ecdsa521.dts create mode 100644 test/py/tests/vboot/sandbox-u-boot-global-ecdsa256.dts create mode 100644 test/py/tests/vboot/sandbox-u-boot-global-ecdsa384.dts create mode 100644 test/py/tests/vboot/sandbox-u-boot-global-ecdsa521.dts
test/py/tests/test_vboot.py +3 -0
@@ -102,6 +102,9 @@ TESTDATA_IN = [ ['algo-arg', 'algo-arg', '', '', '-o sha256,rsa2048', False, False, True, False], ['sha256-global-sign', 'sha256', '-rsa2048', '', '', False, False, False, True], ['sha256-global-sign-pss', 'sha256', '-rsa2048', '-pss', '', False, False, False, True], + ['sha256-global-sign-ecdsa256', 'sha256', '-ecdsa256', '', '', False, False, False, True], + ['sha256-global-sign-ecdsa384', 'sha256', '-ecdsa384', '', '', False, False, False, True], + ['sha256-global-sign-ecdsa521', 'sha256', '-ecdsa521', '', '', False, False, False, True], ] # Mark all but the first test as slow, so they are not run with '-k not slow'
test/py/tests/vboot/sandbox-binman-ecdsa256.dts new file +24 -0
@@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + filename = "sandbox.img"; + + pre-load { + content = <&image>; + algo-name = "sha256,ecdsa256"; + key-name = "dev.pem"; + header-size = <4096>; + version = <1>; + }; + + image: blob-ext { + filename = "test.fit"; + }; + }; +};
test/py/tests/vboot/sandbox-binman-ecdsa384.dts new file +24 -0
@@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + filename = "sandbox.img"; + + pre-load { + content = <&image>; + algo-name = "sha256,ecdsa384"; + key-name = "dev.pem"; + header-size = <4096>; + version = <1>; + }; + + image: blob-ext { + filename = "test.fit"; + }; + }; +};
test/py/tests/vboot/sandbox-binman-ecdsa521.dts new file +24 -0
@@ -0,0 +1,24 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + filename = "sandbox.img"; + + pre-load { + content = <&image>; + algo-name = "sha256,ecdsa521"; + key-name = "dev.pem"; + header-size = <4096>; + version = <1>; + }; + + image: blob-ext { + filename = "test.fit"; + }; + }; +};
test/py/tests/vboot/sandbox-u-boot-global-ecdsa256.dts new file +27 -0
@@ -0,0 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + model = "Sandbox Verified Boot Test"; + compatible = "sandbox"; + + binman { + }; + + reset@0 { + compatible = "sandbox,reset"; + }; + + image { + pre-load { + sig { + algo-name = "sha256,ecdsa256"; + signature-size = <64>; + mandatory = "yes"; + + key-name = "dev"; + }; + }; + }; +};
test/py/tests/vboot/sandbox-u-boot-global-ecdsa384.dts new file +27 -0
@@ -0,0 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + model = "Sandbox Verified Boot Test"; + compatible = "sandbox"; + + binman { + }; + + reset@0 { + compatible = "sandbox,reset"; + }; + + image { + pre-load { + sig { + algo-name = "sha256,ecdsa384"; + signature-size = <96>; + mandatory = "yes"; + + key-name = "dev"; + }; + }; + }; +};
test/py/tests/vboot/sandbox-u-boot-global-ecdsa521.dts new file +27 -0
@@ -0,0 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/dts-v1/; + +/ { + model = "Sandbox Verified Boot Test"; + compatible = "sandbox"; + + binman { + }; + + reset@0 { + compatible = "sandbox,reset"; + }; + + image { + pre-load { + sig { + algo-name = "sha256,ecdsa521"; + signature-size = <132>; + mandatory = "yes"; + + key-name = "dev"; + }; + }; + }; +};
Signature · 1 line
2.43.0
Hi Philippe,
Quoted 1 line · Philippe Reynes
This serie adds the support of ecdsa with software using mbedtls.
series
Quoted 1 line
ecdsa: fix support of secp521r1
Patch 5 fixes secp521r1 support added in patches 1-4, suggesting the initial implementation was incomplete. It would be cleaner to include full secp521r1 support from the start in patches 2-4, making bisection cleaner and avoiding patches that claim ECDSA support but have broken secp521r1.
Regards,
Simon
Hi Philippe,
Quoted 10 lines · Philippe Reynes
This serie adds the support of ecdsa with software using mbedtls. So boards without ecdsa hardware may also use signature with ecdsa.
To add the support of ecdsa with mbedtls, I have:
- enabled ecdsa in mbedtls
- add a functionsw_ecdsa_verifythat uses mbedtls
- add a driversw_ecdsathat callsw_ecdsa_verify
Quoted 5 lines
I have tested this code with sandbox, and I have followed those steps:
0) build u-boot using
sandbox_defconfigand adding those options:CONFIG_ECDSA_SW=y
I think this kconfig is already removed from v4, please double check.
Regards,
Raymond
Quoted 175 lines
CONFIG_ECDSA_MBEDTLS=yCONFIG_ECDSA=yCONFIG_ECDSA_VERIFY=y1) add a signature node to an its file
signature-256 { algo = "sha256,ecdsa256"; key-name-hint = "private-key-256"; };2) generate an ecdsa key
openssl ecparam -name prime256v1 -genkey -noout -out private-key-256.pem3) create the itb file
./tools/mkimage-f <file.its> -k . -Karch/sandbox/dts/test.dtb<file.itb>4) launch sandbox u-boot
./u-boot -d
arch/sandbox/dts/test.dtb5) on sandbox u-boot prompt, load the itb and launch bootm on it
=> host load hostfs - 1000000 uboot-ecdsa.itb
4628674 bytes read in 1 ms (4.3 GiB/s)
=> bootm 1000000
...
...
Verifying Hash Integrity ... sha256,ecdsa256:private-key-256+ OKI have tested with success ecdsa256 and ecdsa384, but there is an issue with secp521r1.
Changes in v2:
- moveECDSA_MBEDTLStoMBEDTLS_LIB_X509
- renamelib/mbedtls/sw_ecdsa.ctolib/mbedtls/ecdsa.c
- enhance dependancies forECDSA_MBEDTLS
- fix support of ecdsa521/secp521r1
- add vboot test using ecdsaChanges in v3:
- do not use_MBEDTLSinmbedtls_def_config.h
- check returns and remove mem leak inlib/mbedtls/ecdsa.c
- remove useless field *k in structecdsa_test_vector_s
- check returns intest/lib/ecdsa.c
- fix third parameter when calling sha*_csum_wd()
- add support of ecdsa in pre-load headerChanges in v4:
- change some dependencies to enable ecc
- useECDSA_MBEDTLSto build the ecdsa driver
- support ecdsa521 and secp521r1
- add a test callingecdsa_verifyfor the ecdsa class
- merge patch 10 and 11 (support ecdsa pre-load for binman and tests)
- several code cleanupPhilippe Reynes (14):
mbedtls: enable support of ecc
ecdsa: initial support of ecdsa using mbedtls
test: lib: ecdsa: add initial test
drivers: crypto: add software ecdsa support
ecdsa: fix support of secp521r1
test: dm:ecdsa.c: clean this test as software ecdsa is now
implemented
test: py: vboot: prepare integration test for ecdsa
test: vboot: add test for ecdsa
tools: mkimage: pre-load: add support of ecdsa
tools: binman: pre-load: add support of ecdsa
boot: pre-load: add support of ecdsa
tools:preload_check_sign: add support of ecdsa
test: py: vboot: prepare test for global signature with ecdsa
test: py: vboot: add test for global signature with ecdsaboot/image-pre-load.c | 56 ++- configs/sandbox_defconfig | 1 + drivers/crypto/Makefile | 1 + drivers/crypto/ecdsa/Makefile | 6 + drivers/crypto/ecdsa/ecdsa-sw.c | 33 ++ include/crypto/ecdsa-uclass.h | 15 +- include/crypto/internal/ecdsa.h | 28 ++ include/u-boot/sha256.h | 2 + include/u-boot/sha512.h | 3 + lib/ecdsa/Kconfig | 1 + lib/ecdsa/ecdsa-libcrypto.c | 83 +++- lib/ecdsa/ecdsa-verify.c | 64 ++- lib/fdt-libcrypto.c | 2 +- lib/mbedtls/Kconfig | 14 + lib/mbedtls/Makefile | 20 +- lib/mbedtls/ecdsa.c | 146 ++++++ lib/mbedtls/mbedtls_def_config.h | 17 + test/dm/ecdsa.c | 104 +++- test/lib/Makefile | 1 + test/lib/ecdsa.c | 453 ++++++++++++++++++ test/py/tests/test_fit_ecdsa.py | 2 +- test/py/tests/test_vboot.py | 143 +++--- .../tests/vboot/sandbox-binman-ecdsa256.dts | 24 + .../tests/vboot/sandbox-binman-ecdsa384.dts | 24 + .../tests/vboot/sandbox-binman-ecdsa521.dts | 24 + ...pss.dts => sandbox-binman-rsa2048-pss.dts} | 0 ...-binman.dts => sandbox-binman-rsa2048.dts} | 0 .../vboot/sandbox-u-boot-global-ecdsa256.dts | 27 ++ .../vboot/sandbox-u-boot-global-ecdsa384.dts | 27 ++ .../vboot/sandbox-u-boot-global-ecdsa521.dts | 27 ++ ... => sandbox-u-boot-global-rsa2048-pss.dts} | 0 ....dts => sandbox-u-boot-global-rsa2048.dts} | 0 ....its => sign-configs-sha1-rsa2048-pss.its} | 0 ...sha1.its => sign-configs-sha1-rsa2048.its} | 0 .../vboot/sign-configs-sha256-ecdsa256.its | 45 ++ .../vboot/sign-configs-sha256-ecdsa384.its | 45 ++ .../vboot/sign-configs-sha256-ecdsa521.its | 45 ++ ... sign-configs-sha256-rsa2048-pss-prod.its} | 0 ...ts => sign-configs-sha256-rsa2048-pss.its} | 0 ...56.its => sign-configs-sha256-rsa2048.its} | 0 ...84.its => sign-configs-sha384-rsa3072.its} | 0 ...s.its => sign-images-sha1-rsa2048-pss.its} | 0 ...-sha1.its => sign-images-sha1-rsa2048.its} | 0 .../vboot/sign-images-sha256-ecdsa256.its | 42 ++ .../vboot/sign-images-sha256-ecdsa384.its | 42 ++ .../vboot/sign-images-sha256-ecdsa521.its | 42 ++ ...its => sign-images-sha256-rsa2048-pss.its} | 0 ...256.its => sign-images-sha256-rsa2048.its} | 0 ...384.its => sign-images-sha384-rsa3072.its} | 0 tools/binman/etype/pre_load.py | 76 ++- tools/binman/ftest.py | 50 ++ tools/binman/test/ecdsa521.pem | 7 + tools/binman/test/security/pre_load_ecdsa.dts | 22 + .../security/pre_load_ecdsa_invalid_algo.dts | 22 + .../security/pre_load_ecdsa_invalid_key.dts | 22 + .../security/pre_load_ecdsa_invalid_sha.dts | 22 + tools/image-host.c | 79 ++- tools/image-sig-host.c | 7 + tools/preload_check_sign.c | 29 ++ 59 files changed, 1810 insertions(+), 135 deletions(-) create mode 100644 drivers/crypto/ecdsa/Makefile create mode 100644 drivers/crypto/ecdsa/ecdsa-sw.c create mode 100644 include/crypto/internal/ecdsa.h create mode 100644 lib/mbedtls/ecdsa.c create mode 100644 test/lib/ecdsa.c create mode 100644 test/py/tests/vboot/sandbox-binman-ecdsa256.dts create mode 100644 test/py/tests/vboot/sandbox-binman-ecdsa384.dts create mode 100644 test/py/tests/vboot/sandbox-binman-ecdsa521.dts rename test/py/tests/vboot/{sandbox-binman-pss.dts => sandbox-binman-rsa2048-pss.dts} (100%) rename test/py/tests/vboot/{sandbox-binman.dts => sandbox-binman-rsa2048.dts} (100%) create mode 100644 test/py/tests/vboot/sandbox-u-boot-global-ecdsa256.dts create mode 100644 test/py/tests/vboot/sandbox-u-boot-global-ecdsa384.dts create mode 100644 test/py/tests/vboot/sandbox-u-boot-global-ecdsa521.dts rename test/py/tests/vboot/{sandbox-u-boot-global-pss.dts => sandbox-u-boot-global-rsa2048-pss.dts} (100%) rename test/py/tests/vboot/{sandbox-u-boot-global.dts => sandbox-u-boot-global-rsa2048.dts} (100%) rename test/py/tests/vboot/{sign-configs-sha1-pss.its => sign-configs-sha1-rsa2048-pss.its} (100%) rename test/py/tests/vboot/{sign-configs-sha1.its => sign-configs-sha1-rsa2048.its} (100%) create mode 100644 test/py/tests/vboot/sign-configs-sha256-ecdsa256.its create mode 100644 test/py/tests/vboot/sign-configs-sha256-ecdsa384.its create mode 100644 test/py/tests/vboot/sign-configs-sha256-ecdsa521.its rename test/py/tests/vboot/{sign-configs-sha256-pss-prod.its => sign-configs-sha256-rsa2048-pss-prod.its} (100%) rename test/py/tests/vboot/{sign-configs-sha256-pss.its => sign-configs-sha256-rsa2048-pss.its} (100%) rename test/py/tests/vboot/{sign-configs-sha256.its => sign-configs-sha256-rsa2048.its} (100%) rename test/py/tests/vboot/{sign-configs-sha384.its => sign-configs-sha384-rsa3072.its} (100%) rename test/py/tests/vboot/{sign-images-sha1-pss.its => sign-images-sha1-rsa2048-pss.its} (100%) rename test/py/tests/vboot/{sign-images-sha1.its => sign-images-sha1-rsa2048.its} (100%) create mode 100644 test/py/tests/vboot/sign-images-sha256-ecdsa256.its create mode 100644 test/py/tests/vboot/sign-images-sha256-ecdsa384.its create mode 100644 test/py/tests/vboot/sign-images-sha256-ecdsa521.its rename test/py/tests/vboot/{sign-images-sha256-pss.its => sign-images-sha256-rsa2048-pss.its} (100%) rename test/py/tests/vboot/{sign-images-sha256.its => sign-images-sha256-rsa2048.its} (100%) rename test/py/tests/vboot/{sign-images-sha384.its => sign-images-sha384-rsa3072.its} (100%) create mode 100644 tools/binman/test/ecdsa521.pem create mode 100644 tools/binman/test/security/pre_load_ecdsa.dts create mode 100644 tools/binman/test/security/pre_load_ecdsa_invalid_algo.dts create mode 100644 tools/binman/test/security/pre_load_ecdsa_invalid_key.dts create mode 100644 tools/binman/test/security/pre_load_ecdsa_invalid_sha.dts--
2.43.0