Skip to content

nrf_security: Rename a Kconfig option and the cmake target #22327

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ The Kconfig option :kconfig:option:`CONFIG_PSA_USE_CC3XX_ASYMMETRIC_ENCRYPTION_D

Configuration of the :ref:`nrf_security_drivers_oberon` is automatically generated based on the user-enabled algorithms in `Asymmetric encryption configurations`_.

The Kconfig option :kconfig:option:`CONFIG_PSA_USE_CRACEN_ASYMMETRIC_DRIVER` enables the :ref:`nrf_security_drivers_cracen` for all supported algorithms.
The Kconfig option :kconfig:option:`CONFIG_PSA_USE_CRACEN_ASYMMETRIC_ENCRYPTION_DRIVER` enables the :ref:`nrf_security_drivers_cracen` for all supported algorithms.

RSA key size configuration is supported as described in `RSA key size configuration`_.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@ Libraries

This section describes the changes related to libraries.

|no_changes_yet_note|
* :ref:`nrf_security_readme` library:

* The ``CONFIG_PSA_USE_CRACEN_ASYMMETRIC_DRIVER`` Kconfig option has been replaced by :kconfig:option:`CONFIG_PSA_USE_CRACEN_ASYMMETRIC_ENCRYPTION_DRIVER`.


.. _migration_3.1_recommended:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,9 @@ Gazell libraries
Security libraries
------------------

|no_changes_yet_note|
* :ref:`nrf_security_readme` library:

* Renamed the ``CONFIG_PSA_USE_CRACEN_ASYMMETRIC_DRIVER`` Kconfig option to :kconfig:option:`CONFIG_PSA_USE_CRACEN_ASYMMETRIC_ENCRYPTION_DRIVER`, which is more descriptive and more consistent with the options of the other drivers.

Modem libraries
---------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ CONFIG_PSA_USE_CRACEN_AEAD_DRIVER=n
CONFIG_PSA_USE_CRACEN_HASH_DRIVER=n
CONFIG_PSA_USE_CRACEN_MAC_DRIVER=n
CONFIG_PSA_USE_CRACEN_KEY_AGREEMENT_DRIVER=n
CONFIG_PSA_USE_CRACEN_ASYMMETRIC_DRIVER=n
CONFIG_PSA_USE_CRACEN_ASYMMETRIC_ENCRYPTION_DRIVER=n
CONFIG_PSA_USE_CRACEN_KEY_MANAGEMENT_DRIVER=n
CONFIG_PSA_USE_CRACEN_KEY_DERIVATION_DRIVER=n
CONFIG_PSA_USE_CRACEN_PAKE_DRIVER=n
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ CONFIG_PSA_USE_CRACEN_AEAD_DRIVER=n
CONFIG_PSA_USE_CRACEN_HASH_DRIVER=n
CONFIG_PSA_USE_CRACEN_MAC_DRIVER=n
CONFIG_PSA_USE_CRACEN_KEY_AGREEMENT_DRIVER=n
CONFIG_PSA_USE_CRACEN_ASYMMETRIC_DRIVER=n
CONFIG_PSA_USE_CRACEN_ASYMMETRIC_ENCRYPTION_DRIVER=n
CONFIG_PSA_USE_CRACEN_KEY_MANAGEMENT_DRIVER=n
CONFIG_PSA_USE_CRACEN_KEY_DERIVATION_DRIVER=n
CONFIG_PSA_USE_CRACEN_PAKE_DRIVER=n
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ CONFIG_PSA_USE_CRACEN_AEAD_DRIVER=n
CONFIG_PSA_USE_CRACEN_HASH_DRIVER=n
CONFIG_PSA_USE_CRACEN_MAC_DRIVER=n
CONFIG_PSA_USE_CRACEN_PAKE_DRIVER=n
CONFIG_PSA_USE_CRACEN_ASYMMETRIC_DRIVER=n
CONFIG_PSA_USE_CRACEN_ASYMMETRIC_ENCRYPTION_DRIVER=n
CONFIG_PSA_USE_CRACEN_ASYMMETRIC_SIGNATURE_DRIVER=n
CONFIG_PSA_USE_CRACEN_KEY_AGREEMENT_DRIVER=n
CONFIG_PSA_USE_CRACEN_KEY_DERIVATION_DRIVER=n
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ CONFIG_PSA_USE_CRACEN_AEAD_DRIVER=n
CONFIG_PSA_USE_CRACEN_HASH_DRIVER=n
CONFIG_PSA_USE_CRACEN_MAC_DRIVER=n
CONFIG_PSA_USE_CRACEN_KEY_AGREEMENT_DRIVER=n
CONFIG_PSA_USE_CRACEN_ASYMMETRIC_DRIVER=n
CONFIG_PSA_USE_CRACEN_ASYMMETRIC_ENCRYPTION_DRIVER=n
CONFIG_PSA_USE_CRACEN_KEY_MANAGEMENT_DRIVER=n
CONFIG_PSA_USE_CRACEN_KEY_DERIVATION_DRIVER=n
CONFIG_PSA_USE_CRACEN_PAKE_DRIVER=n
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ CONFIG_PSA_USE_CRACEN_AEAD_DRIVER=n
CONFIG_PSA_USE_CRACEN_HASH_DRIVER=n
CONFIG_PSA_USE_CRACEN_MAC_DRIVER=n
CONFIG_PSA_USE_CRACEN_KEY_AGREEMENT_DRIVER=n
CONFIG_PSA_USE_CRACEN_ASYMMETRIC_DRIVER=n
CONFIG_PSA_USE_CRACEN_ASYMMETRIC_ENCRYPTION_DRIVER=n
CONFIG_PSA_USE_CRACEN_KEY_MANAGEMENT_DRIVER=n
CONFIG_PSA_USE_CRACEN_KEY_DERIVATION_DRIVER=n
CONFIG_PSA_USE_CRACEN_PAKE_DRIVER=n
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ CONFIG_PSA_USE_CRACEN_AEAD_DRIVER=n
CONFIG_PSA_USE_CRACEN_HASH_DRIVER=n
CONFIG_PSA_USE_CRACEN_MAC_DRIVER=n
CONFIG_PSA_USE_CRACEN_KEY_AGREEMENT_DRIVER=n
CONFIG_PSA_USE_CRACEN_ASYMMETRIC_DRIVER=n
CONFIG_PSA_USE_CRACEN_ASYMMETRIC_ENCRYPTION_DRIVER=n
CONFIG_PSA_USE_CRACEN_KEY_MANAGEMENT_DRIVER=n
CONFIG_PSA_USE_CRACEN_KEY_DERIVATION_DRIVER=n
CONFIG_PSA_USE_CRACEN_PAKE_DRIVER=n
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ CONFIG_PSA_USE_CRACEN_AEAD_DRIVER=n
CONFIG_PSA_USE_CRACEN_HASH_DRIVER=n
CONFIG_PSA_USE_CRACEN_MAC_DRIVER=n
CONFIG_PSA_USE_CRACEN_KEY_AGREEMENT_DRIVER=n
CONFIG_PSA_USE_CRACEN_ASYMMETRIC_DRIVER=n
CONFIG_PSA_USE_CRACEN_ASYMMETRIC_ENCRYPTION_DRIVER=n
CONFIG_PSA_USE_CRACEN_KEY_MANAGEMENT_DRIVER=n
CONFIG_PSA_USE_CRACEN_KEY_DERIVATION_DRIVER=n
CONFIG_PSA_USE_CRACEN_PAKE_DRIVER=n
Expand Down
2 changes: 1 addition & 1 deletion samples/bootloader/socs/nrf54l15_cpuapp.conf
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ CONFIG_PSA_USE_CRACEN_MAC_DRIVER=n
# Hardware support for ED25519
CONFIG_PSA_USE_CRACEN_HASH_DRIVER=y
CONFIG_PSA_USE_CRACEN_CIPHER_DRIVER=y
CONFIG_PSA_USE_CRACEN_ASYMMETRIC_DRIVER=y
CONFIG_PSA_USE_CRACEN_ASYMMETRIC_SIGNATURE_DRIVER=y

# Link Time Optimizations
CONFIG_ISR_TABLES_LOCAL_DECLARATION=y
Expand Down
11 changes: 4 additions & 7 deletions subsys/nrf_security/src/core/lite/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,19 @@
# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
#

# Note: Reusing the name oberon_psa_core as we don't have a normalized
# name for "any" PSA core in the current design

add_library(oberon_psa_core STATIC
add_library(psa_core STATIC
psa_core_lite.c
${NRF_SECURITY_ROOT}/src/psa_crypto_driver_wrappers.c
)

target_link_libraries(oberon_psa_core
target_link_libraries(psa_core
PRIVATE
psa_crypto_library_config
)

nrf_security_add_zephyr_options_library(oberon_psa_core)
nrf_security_add_zephyr_options_library(psa_core)

target_link_libraries(${mbedcrypto_target}
PRIVATE
oberon_psa_core
psa_core
)
14 changes: 7 additions & 7 deletions subsys/nrf_security/src/core/nrf_oberon/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,37 +16,37 @@ append_with_prefix(src_crypto_core_oberon ${OBERON_PSA_CORE_PATH}/library/
psa_crypto_storage.c
)

add_library(oberon_psa_core STATIC
add_library(psa_core STATIC
${src_crypto_core_oberon}
)

# Add the nordic version of psa_crypto_driver_wrappers with the core (out of tree)
target_sources(oberon_psa_core
target_sources(psa_core
PRIVATE
${NRF_SECURITY_ROOT}/src/psa_crypto_driver_wrappers.c
)

target_link_libraries(oberon_psa_core
target_link_libraries(psa_core
PRIVATE
psa_crypto_library_config
psa_interface
)

target_compile_definitions(oberon_psa_core
target_compile_definitions(psa_core
PRIVATE
BUILDING_MBEDTLS_CRYPTO
)

target_link_libraries(oberon_psa_core
target_link_libraries(psa_core
PRIVATE
psa_crypto_library_config
mbedcrypto_base
nrf_security_utils
)

nrf_security_add_zephyr_options_library(oberon_psa_core)
nrf_security_add_zephyr_options_library(psa_core)

target_link_libraries(${mbedcrypto_target}
PRIVATE
oberon_psa_core
psa_core
)
6 changes: 3 additions & 3 deletions subsys/nrf_security/src/drivers/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -179,14 +179,14 @@ config PSA_USE_CRACEN_KEY_AGREEMENT_DRIVER
bool "Cracen key agreement driver"
default y

config PSA_USE_CRACEN_ASYMMETRIC_DRIVER
bool "Cracen asymmetric encryption and signature driver"
config PSA_USE_CRACEN_ASYMMETRIC_ENCRYPTION_DRIVER
bool "Cracen asymmetric encryption driver"
default y

config PSA_USE_CRACEN_KEY_MANAGEMENT_DRIVER
bool "Cracen key management driver"
default y
depends on PSA_USE_CRACEN_ASYMMETRIC_DRIVER || \
depends on PSA_USE_CRACEN_ASYMMETRIC_ENCRYPTION_DRIVER || \
PSA_USE_CRACEN_KEY_AGREEMENT_DRIVER


Expand Down
4 changes: 2 additions & 2 deletions subsys/nrf_security/src/drivers/cracen/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ else()
add_dependencies(cracen_psa_driver zephyr_generated_headers)
endif()

# Link oberon_psa_core with this PSA crypto driver
target_link_libraries(oberon_psa_core
# Link psa_core with this PSA crypto driver
target_link_libraries(psa_core
PRIVATE
cracen_psa_driver
)
Expand Down
28 changes: 14 additions & 14 deletions subsys/nrf_security/src/drivers/cracen/psa_driver.Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ config PSA_NEED_CRACEN_ECDSA_SECP_R1_192
default y
depends on PSA_WANT_ALG_ECDSA || PSA_WANT_ALG_DETERMINISTIC_ECDSA
depends on PSA_WANT_ECC_SECP_R1_192
depends on PSA_USE_CRACEN_ASYMMETRIC_DRIVER
depends on PSA_USE_CRACEN_ASYMMETRIC_SIGNATURE_DRIVER

config PSA_NEED_CRACEN_ECDSA_SECP_R1_224
bool
Expand All @@ -281,7 +281,7 @@ config PSA_NEED_CRACEN_ECDSA_SECP_R1_224
select PSA_ACCEL_ECDSA_SECP_R1_224_SHA_512 if PSA_WANT_ALG_SHA_512
depends on PSA_WANT_ALG_ECDSA || PSA_WANT_ALG_DETERMINISTIC_ECDSA
depends on PSA_WANT_ECC_SECP_R1_224
depends on PSA_USE_CRACEN_ASYMMETRIC_DRIVER
depends on PSA_USE_CRACEN_ASYMMETRIC_SIGNATURE_DRIVER

config PSA_NEED_CRACEN_ECDSA_SECP_R1_256
bool
Expand All @@ -293,7 +293,7 @@ config PSA_NEED_CRACEN_ECDSA_SECP_R1_256
select PSA_ACCEL_ECDSA_SECP_R1_256_SHA_512 if PSA_WANT_ALG_SHA_512
depends on PSA_WANT_ALG_ECDSA || PSA_WANT_ALG_DETERMINISTIC_ECDSA
depends on PSA_WANT_ECC_SECP_R1_256
depends on PSA_USE_CRACEN_ASYMMETRIC_DRIVER
depends on PSA_USE_CRACEN_ASYMMETRIC_SIGNATURE_DRIVER

config PSA_NEED_CRACEN_ECDSA_SECP_R1_384
bool
Expand All @@ -305,7 +305,7 @@ config PSA_NEED_CRACEN_ECDSA_SECP_R1_384
select PSA_ACCEL_ECDSA_SECP_R1_384_SHA_512 if PSA_WANT_ALG_SHA_512
depends on PSA_WANT_ALG_ECDSA || PSA_WANT_ALG_DETERMINISTIC_ECDSA
depends on PSA_WANT_ECC_SECP_R1_384
depends on PSA_USE_CRACEN_ASYMMETRIC_DRIVER
depends on PSA_USE_CRACEN_ASYMMETRIC_SIGNATURE_DRIVER

config PSA_NEED_CRACEN_ECDSA_SECP_R1_521
bool
Expand All @@ -317,7 +317,7 @@ config PSA_NEED_CRACEN_ECDSA_SECP_R1_521
select PSA_ACCEL_ECDSA_SECP_R1_521_SHA_512 if PSA_WANT_ALG_SHA_512
depends on PSA_WANT_ALG_ECDSA || PSA_WANT_ALG_DETERMINISTIC_ECDSA
depends on PSA_WANT_ECC_SECP_R1_521
depends on PSA_USE_CRACEN_ASYMMETRIC_DRIVER
depends on PSA_USE_CRACEN_ASYMMETRIC_SIGNATURE_DRIVER

config PSA_NEED_CRACEN_ECDSA_SECP_R1
bool
Expand All @@ -333,14 +333,14 @@ config PSA_NEED_CRACEN_ECDSA_SECP_K1_192
default y
depends on PSA_WANT_ALG_ECDSA || PSA_WANT_ALG_DETERMINISTIC_ECDSA
depends on PSA_WANT_ECC_SECP_K1_192
depends on PSA_USE_CRACEN_ASYMMETRIC_DRIVER
depends on PSA_USE_CRACEN_ASYMMETRIC_SIGNATURE_DRIVER

config PSA_NEED_CRACEN_ECDSA_SECP_K1_256
bool
default y
depends on PSA_WANT_ALG_ECDSA || PSA_WANT_ALG_DETERMINISTIC_ECDSA
depends on PSA_WANT_ECC_SECP_K1_256
depends on PSA_USE_CRACEN_ASYMMETRIC_DRIVER
depends on PSA_USE_CRACEN_ASYMMETRIC_SIGNATURE_DRIVER

config PSA_NEED_CRACEN_ECDSA_SECP_K1
bool
Expand Down Expand Up @@ -370,23 +370,23 @@ config PSA_NEED_CRACEN_PURE_EDDSA_TWISTED_EDWARDS_255
select PSA_ACCEL_PURE_EDDSA_TWISTED_EDWARDS_255
depends on PSA_WANT_ALG_PURE_EDDSA
depends on PSA_WANT_ECC_TWISTED_EDWARDS_255
depends on PSA_USE_CRACEN_ASYMMETRIC_DRIVER
depends on PSA_USE_CRACEN_ASYMMETRIC_SIGNATURE_DRIVER

config PSA_NEED_CRACEN_PURE_EDDSA_TWISTED_EDWARDS_448
bool
default y
select PSA_ACCEL_PURE_EDDSA_TWISTED_EDWARDS_448
depends on PSA_WANT_ALG_PURE_EDDSA
depends on PSA_WANT_ECC_TWISTED_EDWARDS_448
depends on PSA_USE_CRACEN_ASYMMETRIC_DRIVER
depends on PSA_USE_CRACEN_ASYMMETRIC_SIGNATURE_DRIVER

config PSA_NEED_CRACEN_ED25519PH
bool
default y
select PSA_ACCEL_ED25519PH
depends on PSA_WANT_ALG_ED25519PH
depends on PSA_WANT_ECC_TWISTED_EDWARDS_255
depends on PSA_USE_CRACEN_ASYMMETRIC_DRIVER
depends on PSA_USE_CRACEN_ASYMMETRIC_SIGNATURE_DRIVER

config PSA_NEED_CRACEN_PURE_EDDSA_TWISTED_EDWARDS
bool
Expand Down Expand Up @@ -424,7 +424,7 @@ config PSA_NEED_CRACEN_RSA_PKCS1V15_SIGN
depends on PSA_WANT_RSA_KEY_SIZE_2048 || PSA_WANT_RSA_KEY_SIZE_3072 || \
PSA_WANT_RSA_KEY_SIZE_4096
depends on PSA_WANT_ALG_RSA_PKCS1V15_SIGN
depends on PSA_USE_CRACEN_ASYMMETRIC_DRIVER
depends on PSA_USE_CRACEN_ASYMMETRIC_SIGNATURE_DRIVER

config PSA_NEED_CRACEN_RSA_PSS
bool
Expand All @@ -447,7 +447,7 @@ config PSA_NEED_CRACEN_RSA_PSS
depends on PSA_WANT_RSA_KEY_SIZE_2048 || PSA_WANT_RSA_KEY_SIZE_3072 || \
PSA_WANT_RSA_KEY_SIZE_4096
depends on PSA_WANT_ALG_RSA_PSS
depends on PSA_USE_CRACEN_ASYMMETRIC_DRIVER
depends on PSA_USE_CRACEN_ASYMMETRIC_SIGNATURE_DRIVER

config PSA_NEED_CRACEN_ASYMMETRIC_SIGNATURE_ANY_RSA
bool
Expand Down Expand Up @@ -483,7 +483,7 @@ config PSA_NEED_CRACEN_RSA_OAEP
depends on PSA_WANT_RSA_KEY_SIZE_2048 || PSA_WANT_RSA_KEY_SIZE_3072 || \
PSA_WANT_RSA_KEY_SIZE_4096
depends on PSA_WANT_ALG_RSA_OAEP
depends on PSA_USE_CRACEN_ASYMMETRIC_DRIVER
depends on PSA_USE_CRACEN_ASYMMETRIC_ENCRYPTION_DRIVER

config PSA_NEED_CRACEN_RSA_PKCS1V15_CRYPT
bool
Expand All @@ -494,7 +494,7 @@ config PSA_NEED_CRACEN_RSA_PKCS1V15_CRYPT
depends on PSA_WANT_RSA_KEY_SIZE_2048 || PSA_WANT_RSA_KEY_SIZE_3072 || \
PSA_WANT_RSA_KEY_SIZE_4096
depends on PSA_WANT_ALG_RSA_PKCS1V15_CRYPT
depends on PSA_USE_CRACEN_ASYMMETRIC_DRIVER
depends on PSA_USE_CRACEN_ASYMMETRIC_ENCRYPTION_DRIVER

config PSA_NEED_CRACEN_ASYMMETRIC_ENCRYPTION_DRIVER
bool
Expand Down
6 changes: 3 additions & 3 deletions subsys/nrf_security/src/drivers/nrf_cc3xx/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ target_include_directories(psa_crypto_library_config
${NRF_CC3XX_MBEDCRYPTO_INCLUDE_PATH}
)

# Link oberon_psa_core with the imported libraries
target_link_libraries(oberon_psa_core
# Link psa_core with the imported libraries
target_link_libraries(psa_core
INTERFACE
nrf_cc3xx_psa_crypto_imported
nrf_cc3xx_core_imported
c
)
)
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ target_include_directories(psa_crypto_library_config
)

# Link the Oberon PSA core with nrf_cc3xx_platform
target_link_libraries(oberon_psa_core
target_link_libraries(psa_core
PRIVATE
nrf_cc3xx_platform
)
4 changes: 2 additions & 2 deletions subsys/nrf_security/src/drivers/nrf_oberon/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ target_link_libraries(oberon_psa_driver
mbedcrypto_oberon_imported
)

# Link oberon_psa_core with this driver
target_link_libraries(oberon_psa_core
# Link psa_core with this driver
target_link_libraries(psa_core
PRIVATE
oberon_psa_driver
)
Expand Down
2 changes: 1 addition & 1 deletion subsys/nrf_security/src/drivers/zephyr/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

# Add the RNG driver to the Oberon PSA core (if needed)
if (PSA_NEED_NRF_RNG_ENTROPY_DRIVER)
target_sources(oberon_psa_core
target_sources(psa_core
PRIVATE
nrf_rng_entropy.c
)
Expand Down
2 changes: 1 addition & 1 deletion west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ manifest:
compare-by-default: false
- name: find-my
repo-path: sdk-find-my
revision: 90b93338d2bbfddb47b397e4ef5bf8e5d6fe11aa
revision: pull/314/head
groups:
- find-my
- name: azure-sdk-for-c
Expand Down
Loading