Skip to content

Commit ef55d69

Browse files
frkvnordicjm
authored andcommitted
Manifest: Update to nrf_cc3xx v0.9.21
-This manifest commit updates to nrf_cc3xx v0.9.21 -In addition this commit includes usage of the three new drivers that provide asymmetric signature, key agreement and key management using ECC and RSA based on the nrf_cc3xx library. This is provided together to ensure that the change is bisectable -The drivers are added to a new internal library called cc3xx_psa_driver Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>
1 parent f002799 commit ef55d69

2 files changed

Lines changed: 51 additions & 2 deletions

File tree

subsys/nrf_security/src/drivers/nrf_cc3xx/CMakeLists.txt

Lines changed: 50 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66

77
# Get the include-folders from the imported CC3XX library
8-
get_target_property(NRF_CC3XX_MBEDCRYPTO_INCLUDE_PATH
8+
get_target_property(NRF_CC3XX_MBEDCRYPTO_INCLUDE_PATH
99
nrf_cc3xx_core_imported INTERFACE_INCLUDE_DIRECTORIES)
1010

1111
# Add nrf_cc3xx PSA Crypto Driver includes to psa_crypto_library_config
@@ -14,9 +14,58 @@ target_include_directories(psa_crypto_library_config
1414
${NRF_CC3XX_MBEDCRYPTO_INCLUDE_PATH}
1515
)
1616

17+
if(CONFIG_PSA_NEED_CC3XX_ASYMMETRIC_SIGNATURE_DRIVER)
18+
list(APPEND src_crypto_cc3xx
19+
public_cc3xx_psa_asymmetric_signature.c
20+
)
21+
endif()
22+
23+
if(CONFIG_PSA_NEED_CC3XX_KEY_AGREEMENT_DRIVER)
24+
list(APPEND src_crypto_cc3xx
25+
public_cc3xx_psa_key_agreement.c
26+
)
27+
endif()
28+
29+
if(CONFIG_PSA_NEED_CC3XX_KEY_MANAGEMENT_DRIVER)
30+
list(APPEND src_crypto_cc3xx
31+
public_cc3xx_psa_key_management.c
32+
)
33+
endif()
34+
35+
# Add the PSA crypto driver only if any of the source files are added
36+
if(src_crypto_cc3xx)
37+
add_library(cc3xx_psa_driver STATIC
38+
${src_crypto_cc3xx}
39+
)
40+
41+
# Link to the PSA interface and library PSA crypto configurations
42+
target_link_libraries(cc3xx_psa_driver
43+
PRIVATE
44+
psa_crypto_library_config
45+
psa_interface
46+
)
47+
48+
# Link psa_core with this driver
49+
target_link_libraries(psa_core
50+
PRIVATE
51+
cc3xx_psa_driver
52+
)
53+
54+
# Link to imported libraries for CC3XX APIs.
55+
target_link_libraries(cc3xx_psa_driver
56+
PRIVATE
57+
nrf_cc3xx_psa_crypto_imported
58+
nrf_cc3xx_core_imported
59+
nrf_security_utils
60+
)
61+
62+
nrf_security_add_zephyr_options_library(cc3xx_psa_driver)
63+
endif()
64+
1765
# Link psa_core with the imported libraries
1866
target_link_libraries(psa_core
1967
INTERFACE
68+
$<TARGET_NAME_IF_EXISTS:cc3xx_psa_driver>
2069
nrf_cc3xx_psa_crypto_imported
2170
nrf_cc3xx_core_imported
2271
c

west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ manifest:
145145
- name: nrfxlib
146146
repo-path: sdk-nrfxlib
147147
path: nrfxlib
148-
revision: 0178b40672cb53ad50dda43c7ee9520f6b04f172
148+
revision: 332808f18c01d7a418105274e2526f0dc05e111b
149149
- name: trusted-firmware-m
150150
repo-path: sdk-trusted-firmware-m
151151
path: modules/tee/tf-m/trusted-firmware-m

0 commit comments

Comments
 (0)