crypto: 54h: Delete SSF_PSA

SebastianBoe · nordicjm · commit 12e186d5902f · 2025-09-02T07:50:44.000+01:00
In NCS we reorganized such that SSF_PSA was renamed to PSA_SSF, but
not all references have been updated.

In this commit we delete SSF_PSA so that we only have PSA_SSF.

Ref: NCSDK-NONE

Signed-off-by: Sebastian Bøe &lt;sebastian.boe@nordicsemi.no&gt;
diff --git a/doc/nrf/libraries/others/app_jwt.rst b/doc/nrf/libraries/others/app_jwt.rst
@@ -20,7 +20,6 @@ To use the library to request a JWT, complete the following steps:
    * :kconfig:option:`CONFIG_APP_JWT_VERIFY_SIGNATURE`
    * :kconfig:option:`CONFIG_APP_JWT_PRINT_EXPORTED_PUBKEY_DER`
    * :kconfig:option:`CONFIG_NRF_SECURITY`
-   * :kconfig:option:`CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED`
    * :kconfig:option:`CONFIG_SSF_DEVICE_INFO_SERVICE_ENABLED`
 
 #. Generate a signing key pair if you do not want to use the IAK Key.
diff --git a/doc/nrf/links.txt b/doc/nrf/links.txt
@@ -661,7 +661,7 @@
 
 .. _`CONFIG_BT_CTLR_TX_PWR_MINUS`: https://docs.nordicsemi.com/bundle/ncs-latest/page/kconfig/index.html#!CONFIG_BT_CTLR_TX_PWR_MINUS
 .. _`CONFIG_BT_CTLR_TX_PWR_PLUS`: https://docs.nordicsemi.com/bundle/ncs-latest/page/kconfig/index.html#!CONFIG_BT_CTLR_TX_PWR_PLUS
-.. _`PSA CRYPTO SSF SERVICE ENABLED`: https://docs.nordicsemi.com/bundle/ncs-latest/page/kconfig/index.html#!CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED
+.. _`CONFIG_PSA_SSF_CRYPTO_CLIENT`: https://docs.nordicsemi.com/bundle/ncs-latest/page/kconfig/index.html#!CONFIG_PSA_SSF_CRYPTO_CLIENT
 .. _`Matter factory data Kconfig options`: https://docs.nordicsemi.com/bundle/ncs-latest/page/kconfig/index.html#!CHIP_FACTORY_DATA
 .. _`Kconfig search results`: https://docs.nordicsemi.com/bundle/ncs-latest/page/kconfig/index.html#!CONFIG_PM_PARTITION_SIZE
 .. _`CONFIG_PSA_WANT_*`: https://docs.nordicsemi.com/bundle/ncs-latest/page/kconfig/index.html#!CONFIG_PSA_WANT_*
diff --git a/samples/app_jwt/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/app_jwt/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -29,9 +29,6 @@ CONFIG_APP_JWT_PRINT_EXPORTED_PUBKEY_DER=y
 # Enable nordic security backend and PSA APIs
 CONFIG_NRF_SECURITY=y
 
-# Enable PSA crypto from SSF client
-CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y
-
 # Enable Device Info service
 CONFIG_SSF_DEVICE_INFO_SERVICE_ENABLED=y
 
diff --git a/samples/app_jwt/prj.conf b/samples/app_jwt/prj.conf
@@ -20,9 +20,6 @@ CONFIG_APP_JWT_PRINT_EXPORTED_PUBKEY_DER=y
 # Enable nordic security backend and PSA APIs
 CONFIG_NRF_SECURITY=y
 
-# Enable PSA crypto from SSF client
-CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y
-
 # Enable Device Info service
 CONFIG_SSF_DEVICE_INFO_SERVICE_ENABLED=y
 
diff --git a/samples/bluetooth/channel_sounding_ras_initiator/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/channel_sounding_ras_initiator/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -9,7 +9,6 @@ CONFIG_BT_RX_STACK_SIZE=2048
 # Enable PSA RNG
 CONFIG_PSA_CRYPTO_DRIVER_OBERON=n
 CONFIG_PSA_SSF_CRYPTO_CLIENT=y
-CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_NRF_SECURITY=y
 
diff --git a/samples/bluetooth/channel_sounding_ras_reflector/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/channel_sounding_ras_reflector/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -9,7 +9,6 @@ CONFIG_BT_RX_STACK_SIZE=2048
 # Enable PSA RNG
 CONFIG_PSA_CRYPTO_DRIVER_OBERON=n
 CONFIG_PSA_SSF_CRYPTO_CLIENT=y
-CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_NRF_SECURITY=y
 
diff --git a/samples/bluetooth/conn_time_sync/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/conn_time_sync/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -9,7 +9,6 @@ CONFIG_BT_RX_STACK_SIZE=2048
 # Enable PSA RNG
 CONFIG_PSA_CRYPTO_DRIVER_OBERON=n
 CONFIG_PSA_SSF_CRYPTO_CLIENT=y
-CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_NRF_SECURITY=y
 
diff --git a/samples/bluetooth/conn_time_sync/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.conf b/samples/bluetooth/conn_time_sync/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.conf
@@ -7,6 +7,5 @@
 # Enable PSA RNG
 CONFIG_PSA_CRYPTO_DRIVER_OBERON=n
 CONFIG_PSA_SSF_CRYPTO_CLIENT=y
-CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_NRF_SECURITY=y
diff --git a/samples/bluetooth/event_trigger/boards/nrf54h20dk_nrf54h20_cpurad.conf b/samples/bluetooth/event_trigger/boards/nrf54h20dk_nrf54h20_cpurad.conf
@@ -7,6 +7,5 @@
 # Enable PSA RNG
 CONFIG_PSA_CRYPTO_DRIVER_OBERON=n
 CONFIG_PSA_SSF_CRYPTO_CLIENT=y
-CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_NRF_SECURITY=y
diff --git a/samples/bluetooth/iso_combined_bis_and_cis/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/iso_combined_bis_and_cis/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -7,7 +7,6 @@
 # Enable PSA RNG
 CONFIG_PSA_CRYPTO_DRIVER_OBERON=n
 CONFIG_PSA_SSF_CRYPTO_CLIENT=y
-CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_NRF_SECURITY=y
 
diff --git a/samples/bluetooth/iso_combined_bis_and_cis/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.conf b/samples/bluetooth/iso_combined_bis_and_cis/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.conf
@@ -1,6 +1,5 @@
 # Enable PSA RNG
 CONFIG_PSA_CRYPTO_DRIVER_OBERON=n
 CONFIG_PSA_SSF_CRYPTO_CLIENT=y
-CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_NRF_SECURITY=y
diff --git a/samples/bluetooth/iso_time_sync/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/iso_time_sync/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -9,7 +9,6 @@ CONFIG_BT_RX_STACK_SIZE=2048
 # Enable PSA RNG
 CONFIG_PSA_CRYPTO_DRIVER_OBERON=n
 CONFIG_PSA_SSF_CRYPTO_CLIENT=y
-CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_NRF_SECURITY=y
 
diff --git a/samples/bluetooth/iso_time_sync/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.conf b/samples/bluetooth/iso_time_sync/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.conf
@@ -1,6 +1,5 @@
 # Enable PSA RNG
 CONFIG_PSA_CRYPTO_DRIVER_OBERON=n
 CONFIG_PSA_SSF_CRYPTO_CLIENT=y
-CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_NRF_SECURITY=y
diff --git a/samples/bluetooth/llpm/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/llpm/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -14,7 +14,6 @@ CONFIG_BT_CONN_PARAM_ANY=y
 # Enable PSA RNG
 CONFIG_PSA_CRYPTO_DRIVER_OBERON=n
 CONFIG_PSA_SSF_CRYPTO_CLIENT=y
-CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_NRF_SECURITY=y
 # More receive buffers are needed, possibly due to broken flow control in the HCI over IPC implementation.
diff --git a/samples/bluetooth/llpm/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.conf b/samples/bluetooth/llpm/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.conf
@@ -7,6 +7,5 @@
 # Enable PSA RNG
 CONFIG_PSA_CRYPTO_DRIVER_OBERON=n
 CONFIG_PSA_SSF_CRYPTO_CLIENT=y
-CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_NRF_SECURITY=y
diff --git a/samples/bluetooth/radio_coex_1wire/boards/nrf54h20dk_nrf54h20_cpurad.conf b/samples/bluetooth/radio_coex_1wire/boards/nrf54h20dk_nrf54h20_cpurad.conf
@@ -7,6 +7,5 @@
 # Enable PSA RNG
 CONFIG_PSA_CRYPTO_DRIVER_OBERON=n
 CONFIG_PSA_SSF_CRYPTO_CLIENT=y
-CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_NRF_SECURITY=y
diff --git a/samples/bluetooth/radio_notification_cb/boards/nrf54h20dk_nrf54h20_cpurad.conf b/samples/bluetooth/radio_notification_cb/boards/nrf54h20dk_nrf54h20_cpurad.conf
@@ -1,6 +1,5 @@
 # Enable PSA RNG
 CONFIG_PSA_CRYPTO_DRIVER_OBERON=n
 CONFIG_PSA_SSF_CRYPTO_CLIENT=y
-CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_NRF_SECURITY=y
diff --git a/samples/bluetooth/scanning_while_connecting/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/scanning_while_connecting/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -7,6 +7,5 @@
 # Enable PSA RNG
 CONFIG_PSA_CRYPTO_DRIVER_OBERON=n
 CONFIG_PSA_SSF_CRYPTO_CLIENT=y
-CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_NRF_SECURITY=y
diff --git a/samples/bluetooth/scanning_while_connecting/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.conf b/samples/bluetooth/scanning_while_connecting/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.conf
@@ -7,6 +7,5 @@
 # Enable PSA RNG
 CONFIG_PSA_CRYPTO_DRIVER_OBERON=n
 CONFIG_PSA_SSF_CRYPTO_CLIENT=y
-CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_NRF_SECURITY=y
diff --git a/samples/bluetooth/subrating/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/bluetooth/subrating/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -7,7 +7,6 @@
 # Enable PSA RNG
 CONFIG_PSA_CRYPTO_DRIVER_OBERON=n
 CONFIG_PSA_SSF_CRYPTO_CLIENT=y
-CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_NRF_SECURITY=y
 
diff --git a/samples/bluetooth/subrating/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.conf b/samples/bluetooth/subrating/sysbuild/ipc_radio/boards/nrf54h20dk_nrf54h20_cpurad.conf
@@ -1,6 +1,5 @@
 # Enable PSA RNG
 CONFIG_PSA_CRYPTO_DRIVER_OBERON=n
 CONFIG_PSA_SSF_CRYPTO_CLIENT=y
-CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_NRF_SECURITY=y
diff --git a/samples/crypto/aes_cbc/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/crypto/aes_cbc/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -9,7 +9,6 @@ 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
 
 # Mbedtls configuration
 CONFIG_MBEDTLS_ENABLE_HEAP=y
diff --git a/samples/crypto/aes_ccm/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/crypto/aes_ccm/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -9,7 +9,6 @@ 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
 
 # Mbedtls configuration
 CONFIG_MBEDTLS_ENABLE_HEAP=y
diff --git a/samples/crypto/aes_ctr/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/crypto/aes_ctr/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -9,7 +9,6 @@ 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
 
 # Mbedtls configuration
 CONFIG_MBEDTLS_ENABLE_HEAP=y
diff --git a/samples/crypto/aes_gcm/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/crypto/aes_gcm/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -9,7 +9,6 @@ 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
 
 # Mbedtls configuration
 CONFIG_MBEDTLS_ENABLE_HEAP=y
diff --git a/samples/crypto/aes_gcm/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf b/samples/crypto/aes_gcm/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf
@@ -9,7 +9,6 @@ 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
 
 # Mbedtls configuration
 CONFIG_MBEDTLS_ENABLE_HEAP=y
diff --git a/samples/crypto/chachapoly/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/crypto/chachapoly/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -9,7 +9,6 @@ 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
 
 # Mbedtls configuration
 CONFIG_MBEDTLS_ENABLE_HEAP=y
diff --git a/samples/crypto/ecdh/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/crypto/ecdh/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -9,7 +9,6 @@ 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
 
 # Mbedtls configuration
 CONFIG_MBEDTLS_ENABLE_HEAP=y
diff --git a/samples/crypto/ecdh/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf b/samples/crypto/ecdh/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf
@@ -9,7 +9,6 @@ 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
 
 # Mbedtls configuration
 CONFIG_MBEDTLS_ENABLE_HEAP=y
diff --git a/samples/crypto/ecdsa/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/crypto/ecdsa/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -9,7 +9,6 @@ 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
 
 # Mbedtls configuration
 CONFIG_MBEDTLS_ENABLE_HEAP=y
diff --git a/samples/crypto/ecdsa/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf b/samples/crypto/ecdsa/boards/nrf54h20dk_nrf54h20_cpuapp_iron.conf
@@ -9,7 +9,6 @@ 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
 
 # Mbedtls configuration
 CONFIG_MBEDTLS_ENABLE_HEAP=y
diff --git a/samples/crypto/ecjpake/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/crypto/ecjpake/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -9,7 +9,6 @@ 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
 
 # Mbedtls configuration
 CONFIG_MBEDTLS_ENABLE_HEAP=y
diff --git a/samples/crypto/eddsa/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/crypto/eddsa/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -9,7 +9,6 @@ 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
 
 # Mbedtls configuration
 CONFIG_MBEDTLS_ENABLE_HEAP=y
diff --git a/samples/crypto/hkdf/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/crypto/hkdf/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -9,7 +9,6 @@ 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
 
 # Mbedtls configuration
 CONFIG_MBEDTLS_ENABLE_HEAP=y
diff --git a/samples/crypto/hmac/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/crypto/hmac/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -9,7 +9,6 @@ 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
 
 # Mbedtls configuration
 CONFIG_MBEDTLS_ENABLE_HEAP=y
diff --git a/samples/crypto/pbkdf2/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/crypto/pbkdf2/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -9,7 +9,6 @@ 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
 
 # Mbedtls configuration
 CONFIG_MBEDTLS_ENABLE_HEAP=y
diff --git a/samples/crypto/psa_tls/README.rst b/samples/crypto/psa_tls/README.rst
@@ -118,7 +118,7 @@ The table mirrors the test setup used for TLS verification.
            - Also supports :ref:`PSA Crypto nrf_oberon driver<nrf_security_drivers_oberon>`
          * - ``nrf54h20dk/nrf54h20/cpuapp``
              ``nrf54h20dk/nrf54h20/cpurad``
-           - `SSF Crypto <PSA CRYPTO SSF SERVICE ENABLED_>`_
+           - `SSF Crypto <CONFIG_PSA_SSF_CRYPTO_CLIENT_>`_
            - No
            - Yes
            - RSA not supported
@@ -157,7 +157,7 @@ The table mirrors the test setup used for TLS verification.
            - Also supports :ref:`PSA Crypto nrf_oberon driver<nrf_security_drivers_oberon>`
          * - ``nrf54h20dk/nrf54h20/cpuapp``
              ``nrf54h20dk/nrf54h20/cpurad``
-           - `SSF Crypto <PSA CRYPTO SSF SERVICE ENABLED_>`_
+           - `SSF Crypto <CONFIG_PSA_SSF_CRYPTO_CLIENT_>`_
            - No
            - No
            - RSA not supported
diff --git a/samples/crypto/psa_tls/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/crypto/psa_tls/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -9,4 +9,3 @@ 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/samples/crypto/psa_tls/boards/nrf54h20dk_nrf54h20_cpurad.conf b/samples/crypto/psa_tls/boards/nrf54h20dk_nrf54h20_cpurad.conf
@@ -9,4 +9,3 @@ 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/samples/crypto/rng/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/crypto/rng/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -9,7 +9,6 @@ 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
 
 # Mbedtls configuration
 CONFIG_MBEDTLS_ENABLE_HEAP=y
diff --git a/samples/crypto/sha256/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/crypto/sha256/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -9,7 +9,6 @@ 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
 
 # Mbedtls configuration
 CONFIG_MBEDTLS_ENABLE_HEAP=y
diff --git a/samples/crypto/spake2p/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/samples/crypto/spake2p/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -9,7 +9,6 @@ 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
 
 # Mbedtls configuration
 CONFIG_MBEDTLS_ENABLE_HEAP=y
diff --git a/samples/mpsl/timeslot/boards/nrf54h20dk_nrf54h20_cpurad.conf b/samples/mpsl/timeslot/boards/nrf54h20dk_nrf54h20_cpurad.conf
@@ -1,6 +1,5 @@
 # Enable PSA RNG
 CONFIG_PSA_CRYPTO_DRIVER_OBERON=n
 CONFIG_PSA_SSF_CRYPTO_CLIENT=y
-CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
 CONFIG_NRF_SECURITY=y
diff --git a/subsys/sdfw_services/services/CMakeLists.txt b/subsys/sdfw_services/services/CMakeLists.txt
@@ -8,4 +8,3 @@
 add_subdirectory_ifdef(CONFIG_SSF_DEVICE_INFO_SERVICE_ENABLED device_info)
 add_subdirectory_ifdef(CONFIG_SSF_ENC_FW_SERVICE_ENABLED enc_fw)
 add_subdirectory_ifdef(CONFIG_SSF_EXTMEM_SERVICE_ENABLED extmem)
-add_subdirectory_ifdef(CONFIG_SSF_PSA_CRYPTO_SERVICE_ENABLED psa_crypto)
diff --git a/subsys/sdfw_services/services/Kconfig b/subsys/sdfw_services/services/Kconfig
@@ -8,4 +8,3 @@
 rsource "device_info/Kconfig"
 rsource "enc_fw/Kconfig"
 rsource "extmem/Kconfig"
-rsource "psa_crypto/Kconfig"
diff --git a/subsys/sdfw_services/services/psa_crypto/Kconfig b/subsys/sdfw_services/services/psa_crypto/Kconfig
