From 38029a2fe676670a75f70ac3002a2bfc7be7b9bb Mon Sep 17 00:00:00 2001 From: Joakim Andersson Date: Wed, 1 Nov 2023 12:43:22 +0100 Subject: [PATCH] nrf_security: Remove leftover MBEDTLS_PSA_ACCEL_KEY_TYPE configurations Remove leftover MBEDTLS_PSA_ACCEL_KEY_TYPE configurations. The Kconfig symbol for these was removed earlier, so these have no effect anymore. Signed-off-by: Joakim Andersson --- subsys/nrf_security/cmake/psa_crypto_config.cmake | 8 -------- .../nrf_security/configs/psa_crypto_config.h.template | 11 ----------- 2 files changed, 19 deletions(-) diff --git a/subsys/nrf_security/cmake/psa_crypto_config.cmake b/subsys/nrf_security/cmake/psa_crypto_config.cmake index d7304e22b62c..dcaa1010c2e9 100644 --- a/subsys/nrf_security/cmake/psa_crypto_config.cmake +++ b/subsys/nrf_security/cmake/psa_crypto_config.cmake @@ -78,14 +78,6 @@ kconfig_check_and_set_base_int(PSA_MAX_RSA_KEY_BITS) kconfig_check_and_set_base_to_one(PSA_CRYPTO_ACCELERATOR_DRIVER_PRESENT) -kconfig_check_and_set_base_to_one(MBEDTLS_PSA_ACCEL_KEY_TYPE_SUPPORT) -kconfig_check_and_set_base_to_one(MBEDTLS_PSA_ACCEL_KEY_TYPE_ECC_KEY_PAIR) -kconfig_check_and_set_base_to_one(MBEDTLS_PSA_ACCEL_KEY_TYPE_ECC_PUBLIC_KEY) -kconfig_check_and_set_base_to_one(MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_KEY_PAIR) -kconfig_check_and_set_base_to_one(MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_PUBLIC_KEY) -kconfig_check_and_set_base_to_one(MBEDTLS_PSA_ACCEL_KEY_TYPE_AES) -kconfig_check_and_set_base_to_one(MBEDTLS_PSA_ACCEL_KEY_TYPE_CHACHA20) - # Convert nrf_cc3xx_platform driver configurations kconfig_check_and_set_base_to_one(PSA_NEED_CC3XX_CTR_DRBG_DRIVER) kconfig_check_and_set_base_to_one(PSA_NEED_CC3XX_HMAC_DRBG_DRIVER) diff --git a/subsys/nrf_security/configs/psa_crypto_config.h.template b/subsys/nrf_security/configs/psa_crypto_config.h.template index c84bc9b75e05..e9009bf6e761 100644 --- a/subsys/nrf_security/configs/psa_crypto_config.h.template +++ b/subsys/nrf_security/configs/psa_crypto_config.h.template @@ -92,17 +92,6 @@ #cmakedefine PSA_WANT_KEY_TYPE_RSA_KEY_PAIR @PSA_WANT_KEY_TYPE_RSA_KEY_PAIR@ #cmakedefine PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY @PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY@ -/* - * Accelerated key types - */ -#cmakedefine MBEDTLS_PSA_ACCEL_KEY_TYPE_SUPPORT @MBEDTLS_PSA_ACCEL_KEY_TYPE_SUPPORT@ -#cmakedefine MBEDTLS_PSA_ACCEL_KEY_TYPE_ECC_KEY_PAIR @MBEDTLS_PSA_ACCEL_KEY_TYPE_ECC_KEY_PAIR@ -#cmakedefine MBEDTLS_PSA_ACCEL_KEY_TYPE_ECC_PUBLIC_KEY @MBEDTLS_PSA_ACCEL_KEY_TYPE_ECC_PUBLIC_KEY@ -#cmakedefine MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_KEY_PAIR @MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_KEY_PAIR@ -#cmakedefine MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_PUBLIC_KEY @MBEDTLS_PSA_ACCEL_KEY_TYPE_RSA_PUBLIC_KEY@ -#cmakedefine MBEDTLS_PSA_ACCEL_KEY_TYPE_AES @MBEDTLS_PSA_ACCEL_KEY_TYPE_AES@ -#cmakedefine MBEDTLS_PSA_ACCEL_KEY_TYPE_CHACHA20 @MBEDTLS_PSA_ACCEL_KEY_TYPE_CHACHA20@ - /* * nrf_cc3xx_platform driver configurations */