modules: mbedtls: remove deprecated PSA_WANT symbols

DES and elliptic curves secp192r1, secp192k1 and secp224r1 were removed
from tf-psa-crypto.

Signed-off-by: Valerio Setti <vsetti@baylibre.com>

Author: valeriosetti

modules/mbedtls/Kconfig.psa.auto

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 # This file was automatically generated by create_psa_files.py
-# from: ../../../modules/crypto/mbedtls/include/psa/crypto_config.h.
+# from: ../../../modules/crypto/mbedtls-4/tf-psa-crypto/include/psa/crypto_config.h.
 # Do not edit it manually.
 
 config PSA_CRYPTO_CLIENT
@@ -200,22 +200,10 @@ config PSA_WANT_ECC_MONTGOMERY_448
 	bool "PSA_WANT_ECC_MONTGOMERY_448" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
-config PSA_WANT_ECC_SECP_K1_192
-	bool "PSA_WANT_ECC_SECP_K1_192" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
 config PSA_WANT_ECC_SECP_K1_256
 	bool "PSA_WANT_ECC_SECP_K1_256" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
-config PSA_WANT_ECC_SECP_R1_192
-	bool "PSA_WANT_ECC_SECP_R1_192" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
-config PSA_WANT_ECC_SECP_R1_224
-	bool "PSA_WANT_ECC_SECP_R1_224" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
 config PSA_WANT_ECC_SECP_R1_256
 	bool "PSA_WANT_ECC_SECP_R1_256" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
@@ -280,10 +268,6 @@ config PSA_WANT_KEY_TYPE_CHACHA20
 	bool "PSA_WANT_KEY_TYPE_CHACHA20" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL
 
-config PSA_WANT_KEY_TYPE_DES
-	bool "PSA_WANT_KEY_TYPE_DES" if !MBEDTLS_PROMPTLESS
-	default y if PSA_CRYPTO_ENABLE_ALL
-
 config PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY
 	bool "PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY" if !MBEDTLS_PROMPTLESS
 	default y if PSA_CRYPTO_ENABLE_ALL

modules/mbedtls/configs/config-psa.h

@@ -5,7 +5,7 @@
  */
 
 /* This file was automatically generated by create_psa_files.py
- * from: ../../../modules/crypto/mbedtls/include/psa/crypto_config.h
+ * from: ../../../modules/crypto/mbedtls-4/tf-psa-crypto/include/psa/crypto_config.h
  * Do not edit it manually.
  */
 
@@ -196,22 +196,10 @@
 #define PSA_WANT_ECC_MONTGOMERY_448   1
 #endif
 
-#if defined(CONFIG_PSA_WANT_ECC_SECP_K1_192)
-#define PSA_WANT_ECC_SECP_K1_192   1
-#endif
-
 #if defined(CONFIG_PSA_WANT_ECC_SECP_K1_256)
 #define PSA_WANT_ECC_SECP_K1_256   1
 #endif
 
-#if defined(CONFIG_PSA_WANT_ECC_SECP_R1_192)
-#define PSA_WANT_ECC_SECP_R1_192   1
-#endif
-
-#if defined(CONFIG_PSA_WANT_ECC_SECP_R1_224)
-#define PSA_WANT_ECC_SECP_R1_224   1
-#endif
-
 #if defined(CONFIG_PSA_WANT_ECC_SECP_R1_256)
 #define PSA_WANT_ECC_SECP_R1_256   1
 #endif
@@ -276,10 +264,6 @@
 #define PSA_WANT_KEY_TYPE_CHACHA20   1
 #endif
 
-#if defined(CONFIG_PSA_WANT_KEY_TYPE_DES)
-#define PSA_WANT_KEY_TYPE_DES   1
-#endif
-
 #if defined(CONFIG_PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY)
 #define PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY   1
 #endif

modules/mbedtls/create_psa_files.py

@@ -11,8 +11,8 @@
 from typing import List
 
 SCRIPT_PATH = os.path.dirname(__file__)
-INPUT_REL_PATH = os.path.join("..", "..", "..", "modules", "crypto", "mbedtls",
-                              "include", "psa", "crypto_config.h")
+INPUT_REL_PATH = os.path.join("..", "..", "..", "modules", "crypto", "mbedtls-4",
+                              "tf-psa-crypto", "include", "psa", "crypto_config.h")
 INPUT_FILE = os.path.normpath(os.path.join(SCRIPT_PATH, INPUT_REL_PATH))
 
 KCONFIG_PATH=os.path.join(SCRIPT_PATH, "Kconfig.psa.auto")