Skip to content

Commit e5d8640

Browse files
de-nordicnordicjm
authored andcommitted
zephyr: Add missing selection for allowed SHA algorithms
All of ED25519 backends allow SHA512, together with SHA512. The ED25519 internally requires SHA512 for calculations, but image may be hashed with any SHA algorithm. The PSA has also been missing selecting of any SHA as allowed. Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
1 parent b0c7df9 commit e5d8640

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

boot/zephyr/Kconfig

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -287,11 +287,13 @@ choice BOOT_ED25519_IMPLEMENTATION
287287
config BOOT_ED25519_TINYCRYPT
288288
bool "Use tinycrypt"
289289
select BOOT_USE_TINYCRYPT
290+
select BOOT_IMG_HASH_ALG_SHA256_ALLOW
290291
select BOOT_IMG_HASH_ALG_SHA512_ALLOW
291292

292293
config BOOT_ED25519_MBEDTLS
293294
bool "Use mbedTLS"
294295
select BOOT_USE_MBEDTLS
296+
select BOOT_IMG_HASH_ALG_SHA256_ALLOW
295297
select BOOT_IMG_HASH_ALG_SHA512_ALLOW
296298
select MBEDTLS
297299
select MBEDTLS_SHA512
@@ -302,10 +304,13 @@ config BOOT_ED25519_PSA
302304
bool "Use PSA crypto"
303305
select MBEDTLS
304306
select BOOT_USE_PSA_CRYPTO
305-
select MBEDTLS_PSA_CRYPTO_C
306-
select MBEDTLS_ASN1_PARSE_C if MBEDTLS_BUILTIN
307307
select PSA_CRYPTO_CLIENT
308308
select PSA_CRYPTO_C
309+
select MBEDTLS_PSA_CRYPTO_C
310+
select MBEDTLS_ASN1_PARSE_C if MBEDTLS_BUILTIN
311+
select MBEDTLS_ENABLE_HEAP
312+
select BOOT_IMG_HASH_ALG_SHA256_ALLOW
313+
select BOOT_IMG_HASH_ALG_SHA512_ALLOW
309314
select BOOT_ED25519_PSA_DEPENDENCIES
310315
select BOOT_X25519_PSA_DEPENDENCIES if BOOT_ENCRYPT_IMAGE
311316

0 commit comments

Comments
 (0)