Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nrfconnect/sdk-mcuboot
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dc4abc7685eeadca687e09159e5ff521e4b55b23
Choose a base ref
..
head repository: nrfconnect/sdk-mcuboot
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 641126b4e741ff87eeb2201e17c0fec66182a3b7
Choose a head ref
Showing with 13 additions and 6 deletions.
  1. +1 −1 boot/bootutil/zephyr/CMakeLists.txt
  2. +12 −5 boot/zephyr/Kconfig
2 changes: 1 addition & 1 deletion boot/bootutil/zephyr/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -40,7 +40,7 @@ if(CONFIG_BOOT_USE_PSA_CRYPTO)
)
endif()

if(CONFIG_BOOT_USE_MBEDTLS OR CONFIG_BOOT_USE_PSA_CRYPTO)
if(CONFIG_BOOT_USE_MBEDTLS OR CONFIG_BOOT_USE_PSA_CRYPTO AND NOT CONFIG_NRF_SECURITY)
zephyr_link_libraries(mbedTLS)
endif()
endif()
17 changes: 12 additions & 5 deletions boot/zephyr/Kconfig
View file
Original file line number Diff line number Diff line change
@@ -89,8 +89,7 @@ config BOOT_ED25519_PSA_DEPENDENCIES
select PSA_WANT_ALG_SHA_256
select PSA_WANT_ALG_SHA_512
select PSA_WANT_ALG_PURE_EDDSA
# Seems that upstream mbedTLS does not have TE
#select PSA_WANT_ECC_TWISTED_EDWARDS_255
select PSA_WANT_ECC_TWISTED_EDWARDS_255
select PSA_WANT_ECC_MONTGOMERY_255
select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT
help
@@ -285,28 +284,36 @@ config BOOT_SIGNATURE_TYPE_PURE

choice BOOT_ED25519_IMPLEMENTATION
prompt "Ecdsa implementation"
default BOOT_ED25519_PSA if NRF_SECURITY
default BOOT_ED25519_TINYCRYPT

config BOOT_ED25519_TINYCRYPT
bool "Use tinycrypt"
select BOOT_USE_TINYCRYPT
select BOOT_IMG_HASH_ALG_SHA256_ALLOW
select BOOT_IMG_HASH_ALG_SHA512_ALLOW

config BOOT_ED25519_MBEDTLS
bool "Use mbedTLS"
select BOOT_USE_MBEDTLS
select BOOT_IMG_HASH_ALG_SHA256_ALLOW
select BOOT_IMG_HASH_ALG_SHA512_ALLOW
select MBEDTLS
select MBEDTLS_ASN1_PARSE_C if MBEDTLS_BUILTIN
select MBEDTLS_SHA512
select MBEDTLS_ASN1_PARSE_C if MBEDTLS_BUILTIN && !BOOT_KEY_IMPORT_BYPASS_ASN
select BOOT_AES_MBEDTLS_DEPENDENCIES if MBEDTLS_BUILTIN && BOOT_ENCRYPT_IMAGE

config BOOT_ED25519_PSA
bool "Use PSA crypto"
depends on NRF_SECURITY
select BOOT_USE_PSA_CRYPTO
select MBEDTLS_PSA_CRYPTO_C
select MBEDTLS_ASN1_PARSE_C if MBEDTLS_BUILTIN
select PSA_CRYPTO_CLIENT
select PSA_CRYPTO_C
select MBEDTLS_PSA_CRYPTO_C
select MBEDTLS_ASN1_PARSE_C if MBEDTLS_BUILTIN
select MBEDTLS_ENABLE_HEAP
select BOOT_IMG_HASH_ALG_SHA256_ALLOW
select BOOT_IMG_HASH_ALG_SHA512_ALLOW
select BOOT_ED25519_PSA_DEPENDENCIES
select BOOT_X25519_PSA_DEPENDENCIES if BOOT_ENCRYPT_IMAGE