samples: crypto: Added snippet for crypto_service for target nrf54h20

osaether · Vge0rge · commit 8da7e777a0ac · 2024-07-15T10:15:42.000+02:00
Added snippet for crypto_service for targets nrf54h20dk_nrf54h20_cpuapp
and nrf54h20dk_nrf54h20_cpurad and enabled the snippet for supported
samples.

Ref: NCSDK-NONE

Signed-off-by: Ole Sæther &lt;ole.saether@nordicsemi.no&gt;
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -239,6 +239,7 @@ Kconfig*                                  @tejlmand
 /snippets/nrf70-debug/                    @krish2718 @sachinthegreen
 /snippets/nrf70-fw-patch-ext-flash/       @krish2718 @sachinthegreen
 /snippets/nordic-bt-rpc/                  @ppryga-nordic
+/snippets/crypto_service/                 @anhmolt @hakonfam @jonathannilsen
 /subsys/audio_module/                     @nrfconnect/ncs-audio
 /subsys/bluetooth/                        @alwa-nordic @jori-nordic @carlescufi @KAGA164
 /subsys/bluetooth/mesh/                   @ludvigsj
diff --git a/samples/crypto/aes_cbc/CMakeLists.txt b/samples/crypto/aes_cbc/CMakeLists.txt
@@ -6,6 +6,10 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
+if(NOT crypto_service IN_LIST SNIPPET)
+  set(SNIPPET crypto_service ${SNIPPET} CACHE STRING "" FORCE)
+endif()
+
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 
 project(aes_cbc)
diff --git a/samples/crypto/aes_cbc/sample.yaml b/samples/crypto/aes_cbc/sample.yaml
@@ -32,6 +32,8 @@ tests:
     platform_allow: >
       nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns
     harness: console
+    required_snippets:
+      - crypto_service
     harness_config:
       type: multi_line
       regex:
diff --git a/samples/crypto/aes_ccm/CMakeLists.txt b/samples/crypto/aes_ccm/CMakeLists.txt
@@ -6,6 +6,10 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
+if(NOT crypto_service IN_LIST SNIPPET)
+  set(SNIPPET crypto_service ${SNIPPET} CACHE STRING "" FORCE)
+endif()
+
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 
 project(aes_ccm)
diff --git a/samples/crypto/aes_ccm/sample.yaml b/samples/crypto/aes_ccm/sample.yaml
@@ -32,6 +32,8 @@ tests:
     platform_allow: >
       nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns
     harness: console
+    required_snippets:
+      - crypto_service
     harness_config:
       type: multi_line
       regex:
diff --git a/samples/crypto/aes_ctr/CMakeLists.txt b/samples/crypto/aes_ctr/CMakeLists.txt
@@ -6,6 +6,10 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
+if(NOT crypto_service IN_LIST SNIPPET)
+  set(SNIPPET crypto_service ${SNIPPET} CACHE STRING "" FORCE)
+endif()
+
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 
 project(aes_ctr)
diff --git a/samples/crypto/aes_ctr/sample.yaml b/samples/crypto/aes_ctr/sample.yaml
@@ -32,6 +32,8 @@ tests:
     platform_allow: >
       nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns
     harness: console
+    required_snippets:
+      - crypto_service
     harness_config:
       type: multi_line
       regex:
diff --git a/samples/crypto/aes_gcm/CMakeLists.txt b/samples/crypto/aes_gcm/CMakeLists.txt
@@ -6,6 +6,10 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
+if(NOT crypto_service IN_LIST SNIPPET)
+  set(SNIPPET crypto_service ${SNIPPET} CACHE STRING "" FORCE)
+endif()
+
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 
 project(aes_gcm)
diff --git a/samples/crypto/aes_gcm/sample.yaml b/samples/crypto/aes_gcm/sample.yaml
@@ -43,6 +43,8 @@ tests:
       nrf54l15pdk/nrf54l15/cpuapp
       nrf54l15pdk/nrf54l15/cpuapp/ns
     harness: console
+    required_snippets:
+      - crypto_service
     harness_config:
       type: multi_line
       regex:
diff --git a/samples/crypto/chachapoly/CMakeLists.txt b/samples/crypto/chachapoly/CMakeLists.txt
@@ -6,6 +6,10 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
+if(NOT crypto_service IN_LIST SNIPPET)
+  set(SNIPPET crypto_service ${SNIPPET} CACHE STRING "" FORCE)
+endif()
+
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 
 project(chacha_poly)
diff --git a/samples/crypto/chachapoly/sample.yaml b/samples/crypto/chachapoly/sample.yaml
@@ -33,6 +33,8 @@ tests:
       nrf54l15pdk/nrf54l15/cpuapp
       nrf54l15pdk/nrf54l15/cpuapp/ns
     harness: console
+    required_snippets:
+      - crypto_service
     harness_config:
       type: multi_line
       regex:
diff --git a/samples/crypto/ecdh/CMakeLists.txt b/samples/crypto/ecdh/CMakeLists.txt
@@ -6,6 +6,10 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
+if(NOT crypto_service IN_LIST SNIPPET)
+  set(SNIPPET crypto_service ${SNIPPET} CACHE STRING "" FORCE)
+endif()
+
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 
 project(ecdh)
diff --git a/samples/crypto/ecdh/sample.yaml b/samples/crypto/ecdh/sample.yaml
@@ -32,6 +32,8 @@ tests:
     platform_allow: >
       nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns
     harness: console
+    required_snippets:
+      - crypto_service
     harness_config:
       type: multi_line
       regex:
diff --git a/samples/crypto/ecdsa/CMakeLists.txt b/samples/crypto/ecdsa/CMakeLists.txt
@@ -6,6 +6,10 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
+if(NOT crypto_service IN_LIST SNIPPET)
+  set(SNIPPET crypto_service ${SNIPPET} CACHE STRING "" FORCE)
+endif()
+
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 
 project(ecdsa)
diff --git a/samples/crypto/ecdsa/sample.yaml b/samples/crypto/ecdsa/sample.yaml
@@ -32,6 +32,8 @@ tests:
       nrf54l15pdk/nrf54l15/cpuapp
       nrf54l15pdk/nrf54l15/cpuapp/ns
     harness: console
+    required_snippets:
+      - crypto_service
     harness_config:
       type: multi_line
       regex:
diff --git a/samples/crypto/ecjpake/CMakeLists.txt b/samples/crypto/ecjpake/CMakeLists.txt
@@ -5,6 +5,10 @@
 #
 cmake_minimum_required(VERSION 3.20.0)
 
+if(NOT crypto_service IN_LIST SNIPPET)
+  set(SNIPPET crypto_service ${SNIPPET} CACHE STRING "" FORCE)
+endif()
+
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(ecjpake)
 
diff --git a/samples/crypto/ecjpake/sample.yaml b/samples/crypto/ecjpake/sample.yaml
@@ -38,6 +38,8 @@ tests:
       nrf54l15pdk/nrf54l15/cpuapp
       nrf54l15pdk/nrf54l15/cpuapp/ns
     harness: console
+    required_snippets:
+      - crypto_service
     harness_config:
       type: multi_line
       regex:
diff --git a/samples/crypto/eddsa/CMakeLists.txt b/samples/crypto/eddsa/CMakeLists.txt
@@ -6,6 +6,10 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
+if(NOT crypto_service IN_LIST SNIPPET)
+  set(SNIPPET crypto_service ${SNIPPET} CACHE STRING "" FORCE)
+endif()
+
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 
 project(eddsa)
diff --git a/samples/crypto/eddsa/sample.yaml b/samples/crypto/eddsa/sample.yaml
@@ -31,6 +31,8 @@ tests:
     platform_allow: >
       nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns
     harness: console
+    required_snippets:
+      - crypto_service
     harness_config:
       type: multi_line
       regex:
diff --git a/samples/crypto/hkdf/CMakeLists.txt b/samples/crypto/hkdf/CMakeLists.txt
@@ -6,6 +6,10 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
+if(NOT crypto_service IN_LIST SNIPPET)
+  set(SNIPPET crypto_service ${SNIPPET} CACHE STRING "" FORCE)
+endif()
+
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 
 project(hkdf)
diff --git a/samples/crypto/hkdf/sample.yaml b/samples/crypto/hkdf/sample.yaml
@@ -31,12 +31,13 @@ tests:
       nrf54h20dk/nrf54h20/cpuapp
       nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns
     harness: console
+    required_snippets:
+      - crypto_service
     harness_config:
       type: multi_line
       regex:
         - ".*Example finished successfully!.*"
     integration_platforms:
       - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp/ns
-      # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW
       - nrf54h20dk/nrf54h20/cpuapp
diff --git a/samples/crypto/hmac/CMakeLists.txt b/samples/crypto/hmac/CMakeLists.txt
@@ -6,6 +6,10 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
+if(NOT crypto_service IN_LIST SNIPPET)
+  set(SNIPPET crypto_service ${SNIPPET} CACHE STRING "" FORCE)
+endif()
+
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 
 project(hmac)
diff --git a/samples/crypto/hmac/sample.yaml b/samples/crypto/hmac/sample.yaml
@@ -32,6 +32,8 @@ tests:
     platform_allow: >
       nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns
     harness: console
+    required_snippets:
+      - crypto_service
     harness_config:
       type: multi_line
       regex:
diff --git a/samples/crypto/pbkdf2/CMakeLists.txt b/samples/crypto/pbkdf2/CMakeLists.txt
@@ -6,6 +6,10 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
+if(NOT crypto_service IN_LIST SNIPPET)
+  set(SNIPPET crypto_service ${SNIPPET} CACHE STRING "" FORCE)
+endif()
+
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 
 project(pbkdf2)
diff --git a/samples/crypto/pbkdf2/sample.yaml b/samples/crypto/pbkdf2/sample.yaml
@@ -30,12 +30,13 @@ tests:
     platform_allow: >
       nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns
     harness: console
+    required_snippets:
+      - crypto_service
     harness_config:
       type: multi_line
       regex:
         - ".*Example finished successfully!.*"
     integration_platforms:
-      # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp/ns
diff --git a/samples/crypto/rng/CMakeLists.txt b/samples/crypto/rng/CMakeLists.txt
@@ -6,6 +6,10 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
+if(NOT crypto_service IN_LIST SNIPPET)
+  set(SNIPPET crypto_service ${SNIPPET} CACHE STRING "" FORCE)
+endif()
+
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 
 project(rng)
diff --git a/samples/crypto/rng/sample.yaml b/samples/crypto/rng/sample.yaml
@@ -30,6 +30,8 @@ tests:
     platform_allow: >
       nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns
     harness: console
+    required_snippets:
+      - crypto_service
     harness_config:
       type: multi_line
       regex:
diff --git a/samples/crypto/sample.yaml b/samples/crypto/sample.yaml
@@ -0,0 +1,44 @@
+sample:
+  description: |
+    This app provides an example of performing AES encryption and decryption
+    using AES CBC mode
+  name: AES CBC example
+tests:
+  sample.aes_cbc.cc3xx:
+    sysbuild: true
+    tags: introduction psa cc3xx sysbuild
+    platform_allow: >
+      nrf5340dk/nrf5340/cpuapp/ns nrf5340dk/nrf5340/cpuapp nrf9160dk/nrf9160/ns
+      nrf9160dk/nrf9160 nrf52840dk/nrf52840 nrf9161dk/nrf9161 nrf9161dk/nrf9161/ns
+      nrf9151dk/nrf9151 nrf9151dk/nrf9151/ns
+    harness: console
+    harness_config:
+      type: multi_line
+      regex:
+        - ".*Example finished successfully!.*"
+    integration_platforms:
+      - nrf5340dk/nrf5340/cpuapp/ns
+      - nrf5340dk/nrf5340/cpuapp
+      - nrf9160dk/nrf9160/ns
+      - nrf9160dk/nrf9160
+      - nrf52840dk/nrf52840
+      - nrf9161dk/nrf9161
+      - nrf9161dk/nrf9161/ns
+      - nrf9151dk/nrf9151
+      - nrf9151dk/nrf9151/ns
+  sample.aes_cbc.cracen:
+    sysbuild: true
+    tags: introduction psa cracen sysbuild
+    platform_allow: >
+      nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns
+    harness: console
+    required_snippets:
+      - crypto_service
+    harness_config:
+      type: multi_line
+      regex:
+        - ".*Example finished successfully!.*"
+    integration_platforms:
+      - nrf54l15pdk/nrf54l15/cpuapp
+      - nrf54l15pdk/nrf54l15/cpuapp/ns
+      - nrf54h20dk/nrf54h20/cpuapp
diff --git a/samples/crypto/sha256/CMakeLists.txt b/samples/crypto/sha256/CMakeLists.txt
@@ -6,6 +6,10 @@
 
 cmake_minimum_required(VERSION 3.20.0)
 
+if(NOT crypto_service IN_LIST SNIPPET)
+  set(SNIPPET crypto_service ${SNIPPET} CACHE STRING "" FORCE)
+endif()
+
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 
 project(sha256)
diff --git a/samples/crypto/sha256/sample.yaml b/samples/crypto/sha256/sample.yaml
@@ -30,12 +30,13 @@ tests:
     platform_allow: >
         nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns
     harness: console
+    required_snippets:
+      - crypto_service
     harness_config:
       type: multi_line
       regex:
         - ".*Example finished successfully!.*"
     integration_platforms:
-      # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW
       - nrf54h20dk/nrf54h20/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp/ns
diff --git a/samples/crypto/spake2p/CMakeLists.txt b/samples/crypto/spake2p/CMakeLists.txt
@@ -5,6 +5,10 @@
 #
 cmake_minimum_required(VERSION 3.20.0)
 
+if(NOT crypto_service IN_LIST SNIPPET)
+  set(SNIPPET crypto_service ${SNIPPET} CACHE STRING "" FORCE)
+endif()
+
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 project(spake2p)
 
diff --git a/samples/crypto/spake2p/sample.yaml b/samples/crypto/spake2p/sample.yaml
@@ -32,6 +32,8 @@ tests:
       nrf54l15pdk/nrf54l15/cpuapp
       nrf54l15pdk/nrf54l15/cpuapp/ns
     harness: console
+    required_snippets:
+      - crypto_service
     harness_config:
       type: multi_line
       regex:
diff --git a/snippets/crypto_service/crypto_service.conf b/snippets/crypto_service/crypto_service.conf
@@ -0,0 +1,12 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+# Disable Oberon PSA crypto drivers
+CONFIG_PSA_CRYPTO_DRIVER_OBERON=n
+
+# Enable PSA crypto from SSF client
+CONFIG_PSA_SSF_CRYPTO_CLIENT=y
+CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y
diff --git a/snippets/crypto_service/crypto_service.overlay b/snippets/crypto_service/crypto_service.overlay
diff --git a/snippets/crypto_service/snippet.yml b/snippets/crypto_service/snippet.yml
