Skip to content
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.

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

encryption: Improve Kconfig and key generation for zephyr, fix boot serial encrypted image support #1747

Merged
merged 3 commits into from
Aug 9, 2023

Conversation

nordicjm
Copy link
Collaborator

@nordicjm nordicjm commented Jul 17, 2023

Improves the Kconfig layout for encrypted image support and allows using key files instead of just using a pre-defined, insecure dummy key.

Fixes #1753

Copy link
Collaborator

@nvlsianpu nvlsianpu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@nordicjm nordicjm force-pushed the encimprove branch 5 times, most recently from 5e18c8c to 8bc0572 Compare July 26, 2023 13:06
@nordicjm nordicjm changed the title zephyr: encryption: Improve Kconfig and key generation encryption: Improve Kconfig and key generation for zephyr, fix boot serial encrypted image support Jul 26, 2023
@nordicjm nordicjm requested a review from nvlsianpu July 26, 2023 13:43
@@ -256,8 +256,6 @@ Use the ``CONFIG_ENABLE_MGMT_PERUSER=y`` Kconfig option to enable the following

Images uploaded by the serial recovery can be decrypted on the fly by using ECIES primitives described in the [ECIES encryption](encrypted_images.md#ecies-encryption) section.

Enable support for this feature by using ``CONFIG_BOOT_SERIAL_ENCRYPT_EC256=y``.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you explain here How to use this feature with your changes?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I might just remove this section since it doesn't really apply anymore, if encryption is enabled then encrypted images can be used, regardless of type of encryption.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is mentioned in general readame - I'm fine with removal.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nvlsianpu
Copy link
Collaborator

@de-nordic I would merge this If you see no obstacles.

Improves the Kconfig layout for encrypted image support and allows
using key files instead of just using a pre-defined, insecure dummy
key.

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Fixes issues whereby encrypted images were not properly listed due
to not treating them as encrypted, also removes a piece of wrong
hack code that would never run as the primary slot cannot be
encrypted.

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
Adds notes on fixes and changes related to encrypted image handling

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>
@nordicjm nordicjm merged commit fc658eb into mcu-tools:main Aug 9, 2023
54 checks passed
@nordicjm nordicjm deleted the encimprove branch December 12, 2023 15:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: core Affects core functionality area: serial recovery area: zephyr Affects the Zephyr port
Projects
None yet
Development

Successfully merging this pull request may close these issues.

serial recovery image listing does not work with encrypted images
4 participants