samples: crypto: Added snippet for crypto_service for target nrf54h20

osaether · Vge0rge · commit 4fc6d5abe330 · 2024-07-18T15:32:02.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/sample.yaml b/samples/crypto/aes_cbc/sample.yaml
@@ -39,3 +39,17 @@ tests:
     integration_platforms:
       - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp/ns
+  sample.aes_cbc.cracen.crypto_service:
+    sysbuild: true
+    tags: introduction psa cracen sysbuild crypto
+    platform_allow: >
+      nrf54h20dk/nrf54h20/cpuapp
+    harness: console
+    extra_args:
+      - SNIPPET=crypto_service
+    harness_config:
+      type: multi_line
+      regex:
+        - ".*Example finished successfully!.*"
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp
diff --git a/samples/crypto/aes_cbc/sysbuild.cmake b/samples/crypto/aes_cbc/sysbuild.cmake
@@ -0,0 +1,12 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+# For nRF54h20 we need to always include the crypto_service snippet
+if (${NORMALIZED_BOARD_TARGET} STREQUAL "nrf54h20dk_nrf54h20_cpuapp")
+if(NOT crypto_service IN_LIST SNIPPET)
+  set(SNIPPET crypto_service ${SNIPPET} CACHE STRING "" FORCE)
+endif()
+endif()
diff --git a/samples/crypto/aes_ccm/sample.yaml b/samples/crypto/aes_ccm/sample.yaml
@@ -39,3 +39,17 @@ tests:
     integration_platforms:
       - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp/ns
+  sample.aes_ccm.cracen.crypto_service:
+    sysbuild: true
+    tags: introduction psa cracen sysbuild crypto
+    platform_allow: >
+      nrf54h20dk/nrf54h20/cpuapp
+    harness: console
+    extra_args:
+      - SNIPPET=crypto_service
+    harness_config:
+      type: multi_line
+      regex:
+        - ".*Example finished successfully!.*"
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp
diff --git a/samples/crypto/aes_ccm/sysbuild.cmake b/samples/crypto/aes_ccm/sysbuild.cmake
@@ -0,0 +1,12 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+# For nRF54h20 we need to always include the crypto_service snippet
+if (${NORMALIZED_BOARD_TARGET} STREQUAL "nrf54h20dk_nrf54h20_cpuapp")
+if(NOT crypto_service IN_LIST SNIPPET)
+  set(SNIPPET crypto_service ${SNIPPET} CACHE STRING "" FORCE)
+endif()
+endif()
diff --git a/samples/crypto/aes_ctr/sample.yaml b/samples/crypto/aes_ctr/sample.yaml
@@ -39,3 +39,17 @@ tests:
     integration_platforms:
       - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp/ns
+  sample.aes_ctr.cracen.crypto_service:
+    sysbuild: true
+    tags: introduction psa cracen sysbuild crypto
+    platform_allow: >
+      nrf54h20dk/nrf54h20/cpuapp
+    harness: console
+    extra_args:
+      - SNIPPET=crypto_service
+    harness_config:
+      type: multi_line
+      regex:
+        - ".*Example finished successfully!.*"
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp
diff --git a/samples/crypto/aes_ctr/sysbuild.cmake b/samples/crypto/aes_ctr/sysbuild.cmake
@@ -0,0 +1,12 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+# For nRF54h20 we need to always include the crypto_service snippet
+if (${NORMALIZED_BOARD_TARGET} STREQUAL "nrf54h20dk_nrf54h20_cpuapp")
+if(NOT crypto_service IN_LIST SNIPPET)
+  set(SNIPPET crypto_service ${SNIPPET} CACHE STRING "" FORCE)
+endif()
+endif()
diff --git a/samples/crypto/aes_gcm/sample.yaml b/samples/crypto/aes_gcm/sample.yaml
@@ -50,3 +50,17 @@ tests:
     integration_platforms:
       - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp/ns
+  sample.aes_gcm.cracen.crypto_service:
+    sysbuild: true
+    tags: introduction psa cracen sysbuild crypto
+    platform_allow: >
+      nrf54h20dk/nrf54h20/cpuapp
+    harness: console
+    extra_args:
+      - SNIPPET=crypto_service
+    harness_config:
+      type: multi_line
+      regex:
+        - ".*Example finished successfully!.*"
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp
diff --git a/samples/crypto/aes_gcm/sysbuild.cmake b/samples/crypto/aes_gcm/sysbuild.cmake
@@ -0,0 +1,12 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+# For nRF54h20 we need to always include the crypto_service snippet
+if (${NORMALIZED_BOARD_TARGET} STREQUAL "nrf54h20dk_nrf54h20_cpuapp")
+if(NOT crypto_service IN_LIST SNIPPET)
+  set(SNIPPET crypto_service ${SNIPPET} CACHE STRING "" FORCE)
+endif()
+endif()
diff --git a/samples/crypto/chachapoly/sample.yaml b/samples/crypto/chachapoly/sample.yaml
@@ -40,3 +40,17 @@ tests:
     integration_platforms:
       - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp/ns
+  sample.chachapoly.cracen.crypto_service:
+    sysbuild: true
+    tags: introduction psa cracen sysbuild crypto
+    platform_allow: >
+      nrf54h20dk/nrf54h20/cpuapp
+    harness: console
+    extra_args:
+      - SNIPPET=crypto_service
+    harness_config:
+      type: multi_line
+      regex:
+        - ".*Example finished successfully!.*"
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp
diff --git a/samples/crypto/chachapoly/sysbuild.cmake b/samples/crypto/chachapoly/sysbuild.cmake
@@ -0,0 +1,12 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+# For nRF54h20 we need to always include the crypto_service snippet
+if (${NORMALIZED_BOARD_TARGET} STREQUAL "nrf54h20dk_nrf54h20_cpuapp")
+if(NOT crypto_service IN_LIST SNIPPET)
+  set(SNIPPET crypto_service ${SNIPPET} CACHE STRING "" FORCE)
+endif()
+endif()
diff --git a/samples/crypto/ecdh/sample.yaml b/samples/crypto/ecdh/sample.yaml
@@ -39,3 +39,17 @@ tests:
     integration_platforms:
       - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp/ns
+  sample.ecdh.cracen.crypto_service:
+    sysbuild: true
+    tags: introduction psa cracen sysbuild crypto
+    platform_allow: >
+      nrf54h20dk/nrf54h20/cpuapp
+    harness: console
+    extra_args:
+      - SNIPPET=crypto_service
+    harness_config:
+      type: multi_line
+      regex:
+        - ".*Example finished successfully!.*"
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp
diff --git a/samples/crypto/ecdh/sysbuild.cmake b/samples/crypto/ecdh/sysbuild.cmake
@@ -0,0 +1,12 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+# For nRF54h20 we need to always include the crypto_service snippet
+if (${NORMALIZED_BOARD_TARGET} STREQUAL "nrf54h20dk_nrf54h20_cpuapp")
+if(NOT crypto_service IN_LIST SNIPPET)
+  set(SNIPPET crypto_service ${SNIPPET} CACHE STRING "" FORCE)
+endif()
+endif()
diff --git a/samples/crypto/ecdsa/sample.yaml b/samples/crypto/ecdsa/sample.yaml
@@ -39,3 +39,17 @@ tests:
     integration_platforms:
       - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp/ns
+  sample.ecdsa.cracen.crypto_service:
+    sysbuild: true
+    tags: introduction psa cracen sysbuild crypto
+    platform_allow: >
+      nrf54h20dk/nrf54h20/cpuapp
+    harness: console
+    extra_args:
+      - SNIPPET=crypto_service
+    harness_config:
+      type: multi_line
+      regex:
+        - ".*Example finished successfully!.*"
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp
diff --git a/samples/crypto/ecdsa/sysbuild.cmake b/samples/crypto/ecdsa/sysbuild.cmake
@@ -0,0 +1,12 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+# For nRF54h20 we need to always include the crypto_service snippet
+if (${NORMALIZED_BOARD_TARGET} STREQUAL "nrf54h20dk_nrf54h20_cpuapp")
+if(NOT crypto_service IN_LIST SNIPPET)
+  set(SNIPPET crypto_service ${SNIPPET} CACHE STRING "" FORCE)
+endif()
+endif()
diff --git a/samples/crypto/ecjpake/sample.yaml b/samples/crypto/ecjpake/sample.yaml
@@ -45,3 +45,17 @@ tests:
     integration_platforms:
       - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp/ns
+  sample.ecjpake.cracen.crypto_service:
+    sysbuild: true
+    tags: introduction psa cracen sysbuild crypto
+    platform_allow: >
+      nrf54h20dk/nrf54h20/cpuapp
+    harness: console
+    extra_args:
+      - SNIPPET=crypto_service
+    harness_config:
+      type: multi_line
+      regex:
+        - ".*Example finished successfully!.*"
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp
diff --git a/samples/crypto/ecjpake/sysbuild.cmake b/samples/crypto/ecjpake/sysbuild.cmake
@@ -0,0 +1,12 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+# For nRF54h20 we need to always include the crypto_service snippet
+if (${NORMALIZED_BOARD_TARGET} STREQUAL "nrf54h20dk_nrf54h20_cpuapp")
+if(NOT crypto_service IN_LIST SNIPPET)
+  set(SNIPPET crypto_service ${SNIPPET} CACHE STRING "" FORCE)
+endif()
+endif()
diff --git a/samples/crypto/eddsa/sample.yaml b/samples/crypto/eddsa/sample.yaml
@@ -38,3 +38,17 @@ tests:
     integration_platforms:
       - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp/ns
+  sample.eddsa.cracen.crypto_service:
+    sysbuild: true
+    tags: introduction psa cracen sysbuild crypto
+    platform_allow: >
+      nrf54h20dk/nrf54h20/cpuapp
+    harness: console
+    extra_args:
+      - SNIPPET=crypto_service
+    harness_config:
+      type: multi_line
+      regex:
+        - ".*Example finished successfully!.*"
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp
diff --git a/samples/crypto/eddsa/sysbuild.cmake b/samples/crypto/eddsa/sysbuild.cmake
@@ -0,0 +1,12 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+# For nRF54h20 we need to always include the crypto_service snippet
+if (${NORMALIZED_BOARD_TARGET} STREQUAL "nrf54h20dk_nrf54h20_cpuapp")
+if(NOT crypto_service IN_LIST SNIPPET)
+  set(SNIPPET crypto_service ${SNIPPET} CACHE STRING "" FORCE)
+endif()
+endif()
diff --git a/samples/crypto/hkdf/sample.yaml b/samples/crypto/hkdf/sample.yaml
@@ -28,7 +28,6 @@ tests:
     sysbuild: true
     tags: introduction psa cracen sysbuild crypto
     platform_allow: >
-      nrf54h20dk/nrf54h20/cpuapp
       nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns
     harness: console
     harness_config:
@@ -38,5 +37,17 @@ tests:
     integration_platforms:
       - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp/ns
-      # nRF54H uses Oberon+fake entropy until crypto service is available from SDFW
+  sample.hkdf.cracen.crypto_service:
+    sysbuild: true
+    tags: introduction psa cracen sysbuild crypto
+    platform_allow: >
+      nrf54h20dk/nrf54h20/cpuapp
+    harness: console
+    extra_args:
+      - SNIPPET=crypto_service
+    harness_config:
+      type: multi_line
+      regex:
+        - ".*Example finished successfully!.*"
+    integration_platforms:
       - nrf54h20dk/nrf54h20/cpuapp
diff --git a/samples/crypto/hkdf/sysbuild.cmake b/samples/crypto/hkdf/sysbuild.cmake
@@ -0,0 +1,12 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+# For nRF54h20 we need to always include the crypto_service snippet
+if (${NORMALIZED_BOARD_TARGET} STREQUAL "nrf54h20dk_nrf54h20_cpuapp")
+if(NOT crypto_service IN_LIST SNIPPET)
+  set(SNIPPET crypto_service ${SNIPPET} CACHE STRING "" FORCE)
+endif()
+endif()
diff --git a/samples/crypto/hmac/sample.yaml b/samples/crypto/hmac/sample.yaml
@@ -39,3 +39,17 @@ tests:
     integration_platforms:
       - nrf54l15pdk/nrf54l15/cpuapp
       - nrf54l15pdk/nrf54l15/cpuapp/ns
+  sample.hmac.cracen.crypto_service:
+    sysbuild: true
+    tags: introduction psa cracen sysbuild crypto
+    platform_allow: >
+      nrf54h20dk/nrf54h20/cpuapp
+    harness: console
+    extra_args:
+      - SNIPPET=crypto_service
+    harness_config:
+      type: multi_line
+      regex:
+        - ".*Example finished successfully!.*"
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp
diff --git a/samples/crypto/hmac/sysbuild.cmake b/samples/crypto/hmac/sysbuild.cmake
@@ -0,0 +1,12 @@
+#
+# Copyright (c) 2024 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+# For nRF54h20 we need to always include the crypto_service snippet
+if (${NORMALIZED_BOARD_TARGET} STREQUAL "nrf54h20dk_nrf54h20_cpuapp")
+if(NOT crypto_service IN_LIST SNIPPET)
+  set(SNIPPET crypto_service ${SNIPPET} CACHE STRING "" FORCE)
+endif()
+endif()
diff --git a/samples/crypto/pbkdf2/sample.yaml b/samples/crypto/pbkdf2/sample.yaml
@@ -28,14 +28,26 @@ tests:
     sysbuild: true
     tags: introduction psa cracen sysbuild crypto
     platform_allow: >
-      nrf54h20dk/nrf54h20/cpuapp nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns
+      nrf54l15pdk/nrf54l15/cpuapp nrf54l15pdk/nrf54l15/cpuapp/ns
     harness: console
     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
+  sample.pbkdf2.cracen.crypto_service:
+    sysbuild: true
+    tags: introduction psa cracen sysbuild crypto
+    platform_allow: >
+      nrf54h20dk/nrf54h20/cpuapp
+    harness: console
+    extra_args:
+      - SNIPPET=crypto_service
+    harness_config:
+      type: multi_line
+      regex:
+        - ".*Example finished successfully!.*"
+    integration_platforms:
+      - nrf54h20dk/nrf54h20/cpuapp
diff --git a/samples/crypto/pbkdf2/sysbuild.cmake b/samples/crypto/pbkdf2/sysbuild.cmake
diff --git a/samples/crypto/rng/sample.yaml b/samples/crypto/rng/sample.yaml
diff --git a/samples/crypto/rng/sysbuild.cmake b/samples/crypto/rng/sysbuild.cmake
diff --git a/samples/crypto/sha256/sample.yaml b/samples/crypto/sha256/sample.yaml
diff --git a/samples/crypto/sha256/sysbuild.cmake b/samples/crypto/sha256/sysbuild.cmake
diff --git a/samples/crypto/spake2p/sample.yaml b/samples/crypto/spake2p/sample.yaml
diff --git a/samples/crypto/spake2p/sysbuild.cmake b/samples/crypto/spake2p/sysbuild.cmake
diff --git a/snippets/crypto_service/crypto_service.conf b/snippets/crypto_service/crypto_service.conf
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
