Skip to content

Commit 4bfb139

Browse files
committed
[nrf noup] boot: Use NCS_ prefix for sdk-nrf specific Kconfigs
nrf-squash! [nrf noup] Added BOOT_SIGNATURE_USING_ITS for ecdsa configuration Replace NRF_BOOT_SIGNATURE_USING_ITS with NCS_BOOT_SIGNATURE_USING_ITS prefix. Signed-off-by: Dominik Ermel <[email protected]>
1 parent 30e7326 commit 4bfb139

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

boot/bootutil/include/bootutil/crypto/ecdsa.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ static int bootutil_ecdsa_parse_public_key(bootutil_ecdsa_context *ctx,
473473
}
474474
#endif /* !MCUBOOT_BUILTIN_KEY */
475475

476-
#if !defined(CONFIG_NRF_BOOT_SIGNATURE_USING_ITS)
476+
#if !defined(CONFIG_NCS_BOOT_SIGNATURE_USING_ITS)
477477
/* Verify the signature against the provided hash. The signature gets parsed from
478478
* the encoding first, then PSA Crypto has a dedicated API for ECDSA verification
479479
*/
@@ -492,7 +492,7 @@ static inline int bootutil_ecdsa_verify(bootutil_ecdsa_context *ctx,
492492
return (int) psa_verify_hash(ctx->key_id, PSA_ALG_ECDSA(ctx->required_algorithm),
493493
hash, hlen, reformatted_signature, 2*ctx->curve_byte_count);
494494
}
495-
#else /* !CONFIG_NRF_BOOT_SIGNATURE_USING_ITS */
495+
#else /* !CONFIG_NCS_BOOT_SIGNATURE_USING_ITS */
496496

497497
static const psa_key_id_t builtin_key_ids[] = {
498498
0x40022100,
@@ -539,7 +539,7 @@ static inline int bootutil_ecdsa_verify(bootutil_ecdsa_context *ctx,
539539
return status == PSA_SUCCESS ? 0 : 2;
540540
}
541541

542-
#endif /* !CONFIG_NRF_BOOT_SIGNATURE_USING_ITS */
542+
#endif /* !CONFIG_NCS_BOOT_SIGNATURE_USING_ITS */
543543

544544
#elif defined(MCUBOOT_USE_MBED_TLS)
545545

boot/zephyr/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -422,14 +422,14 @@ config BOOT_KMU_KEYS_REVOCATION
422422
help
423423
Enabling KMU key revocation backend.
424424

425-
config NRF_BOOT_SIGNATURE_USING_ITS
425+
config NCS_BOOT_SIGNATURE_USING_ITS
426426
bool "Use ITS stored keys for signature verification"
427427
depends on NRF_SECURITY
428428
help
429429
MCUboot will use keys provisioned to the internal trusted storage for signature
430430
verification instead of compiling in key data from a file.
431431

432-
if !BOOT_SIGNATURE_USING_KMU && !NRF_BOOT_SIGNATURE_USING_ITS
432+
if !BOOT_SIGNATURE_USING_KMU && !NCS_BOOT_SIGNATURE_USING_ITS
433433

434434
config BOOT_SIGNATURE_KEY_FILE
435435
string "PEM key file"

boot/zephyr/include/mcuboot_config/mcuboot_config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
#define MCUBOOT_HW_KEY
6969
#endif
7070

71-
#ifdef CONFIG_NRF_BOOT_SIGNATURE_USING_ITS
71+
#ifdef CONFIG_NCS_BOOT_SIGNATURE_USING_ITS
7272
#define MCUBOOT_BUILTIN_KEY
7373
#endif
7474

0 commit comments

Comments
 (0)