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>

Author: frkv

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

@@ -5,7 +5,7 @@
 #
 
 # Get the include-folders from the imported CC3XX library
-get_target_property(NRF_CC3XX_MBEDCRYPTO_INCLUDE_PATH 
+get_target_property(NRF_CC3XX_MBEDCRYPTO_INCLUDE_PATH
   nrf_cc3xx_core_imported INTERFACE_INCLUDE_DIRECTORIES)
 
 # Add nrf_cc3xx PSA Crypto Driver includes to psa_crypto_library_config
@@ -14,9 +14,58 @@ target_include_directories(psa_crypto_library_config
     ${NRF_CC3XX_MBEDCRYPTO_INCLUDE_PATH}
 )
 
+if(CONFIG_PSA_NEED_CC3XX_ASYMMETRIC_SIGNATURE_DRIVER)
+  list(APPEND src_crypto_cc3xx
+    public_cc3xx_psa_asymmetric_signature.c
+  )
+endif()
+
+if(CONFIG_PSA_NEED_CC3XX_KEY_AGREEMENT_DRIVER)
+  list(APPEND src_crypto_cc3xx
+    public_cc3xx_psa_key_agreement.c
+  )
+endif()
+
+if(CONFIG_PSA_NEED_CC3XX_KEY_MANAGEMENT_DRIVER)
+  list(APPEND src_crypto_cc3xx
+    public_cc3xx_psa_key_management.c
+  )
+endif()
+
+# Add the PSA crypto driver only if any of the source files are added
+if(src_crypto_cc3xx)
+  add_library(cc3xx_psa_driver STATIC
+    ${src_crypto_cc3xx}
+  )
+
+  # Link to the PSA interface and library PSA crypto configurations
+  target_link_libraries(cc3xx_psa_driver
+    PRIVATE
+      psa_crypto_library_config
+      psa_interface
+  )
+
+  # Link psa_core with this driver
+  target_link_libraries(psa_core
+    PRIVATE
+      cc3xx_psa_driver
+  )
+
+  # Link to imported libraries for CC3XX APIs.
+  target_link_libraries(cc3xx_psa_driver
+    PRIVATE
+      nrf_cc3xx_psa_crypto_imported
+      nrf_cc3xx_core_imported
+      nrf_security_utils
+  )
+
+  nrf_security_add_zephyr_options_library(cc3xx_psa_driver)
+endif()
+
 # Link psa_core with the imported libraries
 target_link_libraries(psa_core
   INTERFACE
+    $<TARGET_NAME_IF_EXISTS:cc3xx_psa_driver>
     nrf_cc3xx_psa_crypto_imported
     nrf_cc3xx_core_imported
     c

west.yml

@@ -145,7 +145,7 @@ manifest:
     - name: nrfxlib
       repo-path: sdk-nrfxlib
       path: nrfxlib
-      revision: 31e66bc3ef3d2dc18ca38a10f6d276fa84889b5b
+      revision: pull/2104/head
     - name: trusted-firmware-m
       repo-path: sdk-trusted-firmware-m
       path: modules/tee/tf-m/trusted-firmware-m