Skip to content

Commit 37758d9

Browse files
de-nordicjukkar
authored andcommitted
[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]> (cherry picked from commit 4bfb139)
1 parent 78c73f7 commit 37758d9

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
@@ -475,7 +475,7 @@ static int bootutil_ecdsa_parse_public_key(bootutil_ecdsa_context *ctx,
475475
}
476476
#endif /* !MCUBOOT_BUILTIN_KEY */
477477

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

499499
static const psa_key_id_t builtin_key_ids[] = {
500500
0x40022100,
@@ -541,7 +541,7 @@ static inline int bootutil_ecdsa_verify(bootutil_ecdsa_context *ctx,
541541
return status == PSA_SUCCESS ? 0 : 2;
542542
}
543543

544-
#endif /* !CONFIG_NRF_BOOT_SIGNATURE_USING_ITS */
544+
#endif /* !CONFIG_NCS_BOOT_SIGNATURE_USING_ITS */
545545

546546
#elif defined(MCUBOOT_USE_MBED_TLS)
547547

boot/zephyr/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,14 +435,14 @@ config BOOT_KMU_KEYS_REVOCATION
435435
help
436436
Enabling KMU key revocation backend.
437437

438-
config NRF_BOOT_SIGNATURE_USING_ITS
438+
config NCS_BOOT_SIGNATURE_USING_ITS
439439
bool "Use ITS stored keys for signature verification"
440440
depends on NRF_SECURITY
441441
help
442442
MCUboot will use keys provisioned to the internal trusted storage for signature
443443
verification instead of compiling in key data from a file.
444444

445-
if !BOOT_SIGNATURE_USING_KMU && !NRF_BOOT_SIGNATURE_USING_ITS
445+
if !BOOT_SIGNATURE_USING_KMU && !NCS_BOOT_SIGNATURE_USING_ITS
446446

447447
config BOOT_SIGNATURE_KEY_FILE
448448
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)