Skip to content

Commit b246757

Browse files
michalek-nonordicjm
authored andcommitted
sysbuild: remove openssl key generation
keygen.py is able to generate key. No need to duplicate functionality. Signed-off-by: Mateusz Michalek <[email protected]>
1 parent 58cc3be commit b246757

File tree

3 files changed

+1
-32
lines changed

3 files changed

+1
-32
lines changed

cmake/sysbuild/sign.cmake

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,6 @@ function(b0_gen_keys)
2828
--in ${SIGNATURE_PRIVATE_KEY_FILE}
2929
--out ${SIGNATURE_PUBLIC_KEY_FILE}
3030
)
31-
elseif(SB_CONFIG_SECURE_BOOT_SIGNING_OPENSSL)
32-
set(PUB_GEN_CMD
33-
openssl ec
34-
-pubout
35-
-in ${SIGNATURE_PRIVATE_KEY_FILE}
36-
-out ${SIGNATURE_PUBLIC_KEY_FILE}
37-
)
3831
elseif(SB_CONFIG_SECURE_BOOT_SIGNING_CUSTOM)
3932
string(CONFIGURE "${SB_CONFIG_SECURE_BOOT_SIGNING_PUBLIC_KEY}" SIGNATURE_PUBLIC_KEY_FILE)
4033
set(SIGNATURE_PUBLIC_KEY_FILE ${SIGNATURE_PUBLIC_KEY_FILE} PARENT_SCOPE)
@@ -185,25 +178,6 @@ function(b0_sign_image slot cpunet_target)
185178
--in ${hash_file} ${sign_cmd_signature_type}
186179
> ${signature_file}
187180
)
188-
elseif(SB_CONFIG_SECURE_BOOT_SIGNING_OPENSSL)
189-
if(SB_CONFIG_SECURE_BOOT_SIGNATURE_TYPE_ED25519)
190-
set(sign_cmd
191-
openssl pkeyutl -sign -inkey ${SIGNATURE_PRIVATE_KEY_FILE} -rawin -in ${hash_file} > ${signature_file} &&
192-
openssl pkeyutl -verify -pubin -inkey ${SIGNATURE_PRIVATE_KEY_FILE} -rawin -in ${hash_file} -sigfile ${signature_file}
193-
)
194-
else()
195-
set(sign_cmd
196-
openssl dgst
197-
-${sign_cmd_hash_type}
198-
-sign ${SIGNATURE_PRIVATE_KEY_FILE} ${hash_file} |
199-
${PYTHON_EXECUTABLE}
200-
${ZEPHYR_NRF_MODULE_DIR}/scripts/bootloader/asn1parse.py
201-
--alg ecdsa
202-
--contents signature
203-
> ${signature_file}
204-
)
205-
endif()
206-
207181
elseif(SB_CONFIG_SECURE_BOOT_SIGNING_CUSTOM)
208182
set(custom_sign_cmd "${SB_CONFIG_SECURE_BOOT_SIGNING_COMMAND}")
209183
string(CONFIGURE "${custom_sign_cmd}" custom_sign_cmd)

doc/nrf/app_dev/bootloaders_dfu/mcuboot_nsib/bootloader_adding_sysbuild.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,12 +146,10 @@ See :ref:`ug_fw_update_keys` for information on how to generate custom keys for
146146

147147
For SoCs using KMU for NSIB (nRF54L Series devices), the private key must be provisioned in the KMU before NSIB can be run.
148148

149-
Additionally, the |NSIB| supports the following methods for signing images with private keys:
149+
Additionally, the |NSIB| supports a custom method for signing images with private keys:
150150

151-
* Uses the :kconfig:option:`SB_CONFIG_SECURE_BOOT_SIGNING_OPENSSL` Kconfig option.
152151
* :ref:`Using a custom command <ug_bootloader_adding_sysbuild_immutable_b0_custom_signing>` - Uses the :kconfig:option:`SB_CONFIG_SECURE_BOOT_SIGNING_CUSTOM` Kconfig option.
153152

154-
The OpenSSL method is handled internally by the build system, whereas using custom commands requires more configuration steps.
155153

156154
Checking the public key
157155
^^^^^^^^^^^^^^^^^^^^^^^

sysbuild/Kconfig.secureboot

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -279,9 +279,6 @@ choice SECURE_BOOT_SIGNING
279279
config SECURE_BOOT_SIGNING_PYTHON
280280
bool "Sign with Python ecdsa library"
281281

282-
config SECURE_BOOT_SIGNING_OPENSSL
283-
bool "Sign with openssl command line tool"
284-
285282
config SECURE_BOOT_SIGNING_CUSTOM
286283
bool "Sign with custom command"
287284

0 commit comments

Comments
 (0)