Merge pull request #10413 from bjwtaylor/remove-des
Removal of DES from mbedtls
diff --git a/framework b/framework
index 0bfaf0e..ab4d9ce 160000
--- a/framework
+++ b/framework
@@ -1 +1 @@
-Subproject commit 0bfaf0ed9721b3858e8982698c618ee748b21a7d
+Subproject commit ab4d9cee6d63c0ddcdc150144ff2e1f2db914381
diff --git a/tests/scripts/components-configuration-crypto.sh b/tests/scripts/components-configuration-crypto.sh
index 0551e6a..c330ccd 100644
--- a/tests/scripts/components-configuration-crypto.sh
+++ b/tests/scripts/components-configuration-crypto.sh
@@ -90,9 +90,6 @@
# is disabled below.
scripts/config.py unset-all "^PSA_WANT_KEY_TYPE_RSA_"
scripts/config.py unset-all "^PSA_WANT_ALG_RSA_"
- # DES requires built-in support for key generation (parity check) so it
- # cannot be accelerated
- scripts/config.py unset PSA_WANT_KEY_TYPE_DES
# EC-JPAKE use calloc/free in PSA core
scripts/config.py unset PSA_WANT_ALG_JPAKE
# Enable p192[k|r]1 curves which are disabled by default in tf-psa-crypto.
@@ -330,7 +327,6 @@
scripts/config.py unset PSA_WANT_ALG_OFB
scripts/config.py unset PSA_WANT_ALG_PBKDF2_AES_CMAC_PRF_128
scripts/config.py unset PSA_WANT_ALG_STREAM_CIPHER
- scripts/config.py unset PSA_WANT_KEY_TYPE_DES
# The following modules directly depends on CIPHER_C
scripts/config.py unset MBEDTLS_NIST_KW_C
@@ -1709,10 +1705,6 @@
common_psa_crypto_config_accel_cipher_aead_cmac
- # Disable DES, if it still exists.
- # This can be removed once we remove DES from the library.
- scripts/config.py unset PSA_WANT_KEY_TYPE_DES
-
# Build
# -----
@@ -1749,10 +1741,6 @@
msg "build: full config with non-accelerated cipher inc. AEAD and CMAC"
common_psa_crypto_config_accel_cipher_aead_cmac
- # Disable DES, if it still exists.
- # This can be removed once we remove DES from the library.
- scripts/config.py unset PSA_WANT_KEY_TYPE_DES
-
$MAKE_COMMAND
msg "test: full config with non-accelerated cipher inc. AEAD and CMAC"
@@ -2016,7 +2004,6 @@
scripts/config.py unset PSA_WANT_ALG_CBC_NO_PADDING
scripts/config.py unset PSA_WANT_ALG_CBC_PKCS7
scripts/config.py unset PSA_WANT_ALG_ECB_NO_PADDING
- scripts/config.py unset PSA_WANT_KEY_TYPE_DES
build_test_config_combos ${BUILTIN_SRC_PATH}/aes.o validate_aes_config_variations \
"MBEDTLS_AES_ROM_TABLES" \
@@ -2230,7 +2217,6 @@
scripts/config.py unset PSA_WANT_ALG_CBC_NO_PADDING
scripts/config.py unset PSA_WANT_ALG_CBC_PKCS7
scripts/config.py unset PSA_WANT_ALG_ECB_NO_PADDING
- scripts/config.py unset PSA_WANT_KEY_TYPE_DES
}
component_test_block_cipher_no_decrypt_aesni () {
diff --git a/tests/scripts/depends.py b/tests/scripts/depends.py
index 10d7028..bf401e0 100755
--- a/tests/scripts/depends.py
+++ b/tests/scripts/depends.py
@@ -324,10 +324,6 @@
'-PSA_WANT_ALG_CCM',
'-PSA_WANT_ALG_GCM',
'-PSA_WANT_ALG_ECB_NO_PADDING'],
- 'PSA_WANT_KEY_TYPE_DES': ['-PSA_WANT_ALG_CCM',
- '-PSA_WANT_ALG_GCM',
- '-MBEDTLS_SSL_TICKET_C',
- '-MBEDTLS_SSL_CONTEXT_SERIALIZATION'],
}
def handle_exclusive_groups(config_settings, symbol):
"""For every symbol tested in an exclusive group check if there are other
diff --git a/tests/scripts/set_psa_test_dependencies.py b/tests/scripts/set_psa_test_dependencies.py
index 0be8ac5..3715211 100755
--- a/tests/scripts/set_psa_test_dependencies.py
+++ b/tests/scripts/set_psa_test_dependencies.py
@@ -53,7 +53,6 @@
'MBEDTLS_CHACHAPOLY_C',
'MBEDTLS_CMAC_C',
'MBEDTLS_CTR_DRBG_C',
- 'MBEDTLS_DES_C',
'MBEDTLS_ECDH_C',
'MBEDTLS_ECDSA_C',
'MBEDTLS_ECJPAKE_C',
diff --git a/tf-psa-crypto b/tf-psa-crypto
index 9a43f3f..092a54c 160000
--- a/tf-psa-crypto
+++ b/tf-psa-crypto
@@ -1 +1 @@
-Subproject commit 9a43f3fe868ef6da5a312a3da076b9595e02a75e
+Subproject commit 092a54c67864d06a93ac7e8bfe90b01b3e2ec2e5