diff --git a/doc/nrf/libraries/security/nrf_security/doc/driver_config.rst b/doc/nrf/libraries/security/nrf_security/doc/driver_config.rst index 9902632f82df..1b7ca214fea7 100644 --- a/doc/nrf/libraries/security/nrf_security/doc/driver_config.rst +++ b/doc/nrf/libraries/security/nrf_security/doc/driver_config.rst @@ -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`_. diff --git a/doc/nrf/releases_and_maturity/migration/migration_guide_3.1.rst b/doc/nrf/releases_and_maturity/migration/migration_guide_3.1.rst index 306aee04218f..dd49084e3e52 100644 --- a/doc/nrf/releases_and_maturity/migration/migration_guide_3.1.rst +++ b/doc/nrf/releases_and_maturity/migration/migration_guide_3.1.rst @@ -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: diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst index 5cb60de332e9..3989ca430f75 100644 --- a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst +++ b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst @@ -474,7 +474,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 --------------- diff --git a/samples/bluetooth/central_hids/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.conf b/samples/bluetooth/central_hids/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.conf index b8e4c798e686..b4fed3c881a5 100644 --- a/samples/bluetooth/central_hids/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.conf +++ b/samples/bluetooth/central_hids/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.conf @@ -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 diff --git a/samples/bluetooth/central_uart/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.conf b/samples/bluetooth/central_uart/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.conf index 58ffdf7bf6a4..926ebc123224 100644 --- a/samples/bluetooth/central_uart/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.conf +++ b/samples/bluetooth/central_uart/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.conf @@ -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 diff --git a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54l15dk_nrf54l05_cpuapp.conf b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54l15dk_nrf54l05_cpuapp.conf index 99071ba3d257..c3238a482ec5 100644 --- a/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54l15dk_nrf54l05_cpuapp.conf +++ b/samples/bluetooth/fast_pair/locator_tag/configuration/boards/nrf54l15dk_nrf54l05_cpuapp.conf @@ -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 diff --git a/samples/bluetooth/peripheral_hids_keyboard/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.conf b/samples/bluetooth/peripheral_hids_keyboard/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.conf index b8e4c798e686..b4fed3c881a5 100644 --- a/samples/bluetooth/peripheral_hids_keyboard/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.conf +++ b/samples/bluetooth/peripheral_hids_keyboard/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.conf @@ -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 diff --git a/samples/bluetooth/peripheral_hids_mouse/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.conf b/samples/bluetooth/peripheral_hids_mouse/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.conf index b8e4c798e686..b4fed3c881a5 100644 --- a/samples/bluetooth/peripheral_hids_mouse/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.conf +++ b/samples/bluetooth/peripheral_hids_mouse/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.conf @@ -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 diff --git a/samples/bluetooth/peripheral_lbs/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.conf b/samples/bluetooth/peripheral_lbs/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.conf index 39bb0d8eced4..961f0559c583 100644 --- a/samples/bluetooth/peripheral_lbs/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.conf +++ b/samples/bluetooth/peripheral_lbs/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.conf @@ -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 diff --git a/samples/bluetooth/peripheral_uart/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.conf b/samples/bluetooth/peripheral_uart/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.conf index 58ffdf7bf6a4..926ebc123224 100644 --- a/samples/bluetooth/peripheral_uart/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.conf +++ b/samples/bluetooth/peripheral_uart/boards/nrf54lm20pdk_nrf54lm20a_cpuapp.conf @@ -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 diff --git a/samples/bootloader/socs/nrf54l15_cpuapp.conf b/samples/bootloader/socs/nrf54l15_cpuapp.conf index d5b6676dceb9..a2d2e4c095fc 100644 --- a/samples/bootloader/socs/nrf54l15_cpuapp.conf +++ b/samples/bootloader/socs/nrf54l15_cpuapp.conf @@ -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 diff --git a/subsys/nrf_security/src/core/lite/CMakeLists.txt b/subsys/nrf_security/src/core/lite/CMakeLists.txt index d1bc7ad47a50..06bf77535a1c 100644 --- a/subsys/nrf_security/src/core/lite/CMakeLists.txt +++ b/subsys/nrf_security/src/core/lite/CMakeLists.txt @@ -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 ) diff --git a/subsys/nrf_security/src/core/nrf_oberon/CMakeLists.txt b/subsys/nrf_security/src/core/nrf_oberon/CMakeLists.txt index efd4cfe99d10..d3df59087fef 100644 --- a/subsys/nrf_security/src/core/nrf_oberon/CMakeLists.txt +++ b/subsys/nrf_security/src/core/nrf_oberon/CMakeLists.txt @@ -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 ) diff --git a/subsys/nrf_security/src/drivers/Kconfig b/subsys/nrf_security/src/drivers/Kconfig index 4fda1a9fc1a9..13c19976a3cc 100644 --- a/subsys/nrf_security/src/drivers/Kconfig +++ b/subsys/nrf_security/src/drivers/Kconfig @@ -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 diff --git a/subsys/nrf_security/src/drivers/cracen/CMakeLists.txt b/subsys/nrf_security/src/drivers/cracen/CMakeLists.txt index d6ed509fb30c..d728d02087b1 100644 --- a/subsys/nrf_security/src/drivers/cracen/CMakeLists.txt +++ b/subsys/nrf_security/src/drivers/cracen/CMakeLists.txt @@ -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 ) diff --git a/subsys/nrf_security/src/drivers/cracen/psa_driver.Kconfig b/subsys/nrf_security/src/drivers/cracen/psa_driver.Kconfig index 08cba182a917..f628bf0c2378 100644 --- a/subsys/nrf_security/src/drivers/cracen/psa_driver.Kconfig +++ b/subsys/nrf_security/src/drivers/cracen/psa_driver.Kconfig @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -370,7 +370,7 @@ 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 @@ -378,7 +378,7 @@ config PSA_NEED_CRACEN_PURE_EDDSA_TWISTED_EDWARDS_448 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 @@ -386,7 +386,7 @@ config PSA_NEED_CRACEN_ED25519PH 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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/subsys/nrf_security/src/drivers/nrf_cc3xx/CMakeLists.txt b/subsys/nrf_security/src/drivers/nrf_cc3xx/CMakeLists.txt index 7f7e588faf06..97eceafb9924 100644 --- a/subsys/nrf_security/src/drivers/nrf_cc3xx/CMakeLists.txt +++ b/subsys/nrf_security/src/drivers/nrf_cc3xx/CMakeLists.txt @@ -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 -) \ No newline at end of file +) diff --git a/subsys/nrf_security/src/drivers/nrf_cc3xx_platform/CMakeLists.txt b/subsys/nrf_security/src/drivers/nrf_cc3xx_platform/CMakeLists.txt index 9366c18eee9c..f582059e8b95 100644 --- a/subsys/nrf_security/src/drivers/nrf_cc3xx_platform/CMakeLists.txt +++ b/subsys/nrf_security/src/drivers/nrf_cc3xx_platform/CMakeLists.txt @@ -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 ) diff --git a/subsys/nrf_security/src/drivers/nrf_oberon/CMakeLists.txt b/subsys/nrf_security/src/drivers/nrf_oberon/CMakeLists.txt index 7b5151617983..5f0353c0802d 100644 --- a/subsys/nrf_security/src/drivers/nrf_oberon/CMakeLists.txt +++ b/subsys/nrf_security/src/drivers/nrf_oberon/CMakeLists.txt @@ -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 ) diff --git a/subsys/nrf_security/src/drivers/zephyr/CMakeLists.txt b/subsys/nrf_security/src/drivers/zephyr/CMakeLists.txt index 35682a4fbd06..ef036bbcde20 100644 --- a/subsys/nrf_security/src/drivers/zephyr/CMakeLists.txt +++ b/subsys/nrf_security/src/drivers/zephyr/CMakeLists.txt @@ -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 ) diff --git a/west.yml b/west.yml index 8322141c9dcb..6dbf507a2b9b 100644 --- a/west.yml +++ b/west.yml @@ -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