Skip to content

bootloader: mcuboot: Changes needed to support AES256 #23512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 19, 2025
+26 −2
Merged

bootloader: mcuboot: Changes needed to support AES256 #23512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions cmake/sysbuild/image_signing.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,12 @@ function(zephyr_mcuboot_tasks)
set(confirmed_args)
set(encrypted_args)

if(NOT "${keyfile_enc}" STREQUAL "")
if(CONFIG_MCUBOOT_ENCRYPTION_ALG_AES_256)
set(imgtool_args ${imgtool_args} --encrypt-keylen 256)
endif()
endif()

# Set up .bin outputs.
if(CONFIG_BUILD_OUTPUT_BIN)
if(CONFIG_BUILD_WITH_TFM)
Expand Down
6 changes: 6 additions & 0 deletions cmake/sysbuild/image_signing_firmware_loader.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,12 @@ function(zephyr_mcuboot_tasks)
set(confirmed_args)
set(encrypted_args)

if(NOT "${keyfile_enc}" STREQUAL "")
if(CONFIG_MCUBOOT_ENCRYPTION_ALG_AES_256)
set(imgtool_args ${imgtool_args} --encrypt-keylen 256)
endif()
endif()

# Set up .bin outputs.
if(CONFIG_BUILD_OUTPUT_BIN)
if(CONFIG_BUILD_WITH_TFM)
Expand Down
6 changes: 6 additions & 0 deletions cmake/sysbuild/image_signing_split.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,12 @@ function(zephyr_mcuboot_tasks)
set(confirmed_args)
set(encrypted_args)

if(NOT "${keyfile_enc}" STREQUAL "")
if(CONFIG_MCUBOOT_ENCRYPTION_ALG_AES_256)
set(imgtool_args ${imgtool_args} --encrypt-keylen 256)
endif()
endif()

# Split files apart
split(
ELF_FILE_IN ${ZEPHYR_BINARY_DIR}/${KERNEL_ELF_NAME}
Expand Down
6 changes: 6 additions & 0 deletions cmake/sysbuild/sign_nrf54h20.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,12 @@ function(mcuboot_sign_merged_nrf54h20 merged_hex main_image)
set(imgtool_args --sha 512 ${imgtool_args})
endif()

if(NOT "${keyfile_enc}" STREQUAL "")
if(SB_CONFIG_BOOT_ENCRYPTION_ALG_AES_256)
set(imgtool_args ${imgtool_args} --encrypt-keylen 256)
endif()
endif()

# Set up .hex outputs.
if(SB_CONFIG_BUILD_OUTPUT_HEX)
list(APPEND byproducts ${output}.signed.hex)
Expand Down
4 changes: 2 additions & 2 deletions west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: 2cc69ef97a5ce7871628b29a2eaf2a7b4a628388
revision: 51f0b2c5c449b08826faef7cea0df23e9856ceed
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down Expand Up @@ -128,7 +128,7 @@ manifest:
compare-by-default: true
- name: mcuboot
repo-path: sdk-mcuboot
revision: 0fadab126d9ba51365b3db1cdb6d55ed892c62b4
revision: 3b20ec38019dc0841062ba0622b4d7b6792193e5
path: bootloader/mcuboot
- name: qcbor
url: https://github.com/laurencelundblade/QCBOR
Expand Down
Loading