lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-11-15 15:21:08 +03:00
Code Activity

Merge pull request #10413 from bjwtaylor/remove-des

Browse Source 
Removal of DES from mbedtls
This commit is contained in:
Manuel Pégourié-Gonnard
2025-10-01 07:43:18 +00:00
committed by GitHub
parent 0a49a8b577 db39c0fe0a
commit 332ad50fdb
5 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework

Submodule framework updated: 0bfaf0ed97...ab4d9cee6d

14
tests/scripts/components-configuration-crypto.sh
View File

@@ -90,9 +90,6 @@ component_test_psa_crypto_without_heap() {
# is disabled below. # is disabled below.
scripts/config.py unset-all "^PSA_WANT_KEY_TYPE_RSA_" scripts/config.py unset-all "^PSA_WANT_KEY_TYPE_RSA_"
scripts/config.py unset-all "^PSA_WANT_ALG_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 # EC-JPAKE use calloc/free in PSA core
scripts/config.py unset PSA_WANT_ALG_JPAKE scripts/config.py unset PSA_WANT_ALG_JPAKE
# Enable p192[k|r]1 curves which are disabled by default in tf-psa-crypto. # Enable p192[k|r]1 curves which are disabled by default in tf-psa-crypto.
@@ -330,7 +327,6 @@ component_test_full_no_cipher () {
scripts/config.py unset PSA_WANT_ALG_OFB 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_PBKDF2_AES_CMAC_PRF_128
scripts/config.py unset PSA_WANT_ALG_STREAM_CIPHER 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 # The following modules directly depends on CIPHER_C
scripts/config.py unset MBEDTLS_NIST_KW_C scripts/config.py unset MBEDTLS_NIST_KW_C
@@ -1709,10 +1705,6 @@ component_test_psa_crypto_config_accel_cipher_aead_cmac () {
common_psa_crypto_config_accel_cipher_aead_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
# Build # Build
# ----- # -----
@@ -1749,10 +1741,6 @@ component_test_psa_crypto_config_reference_cipher_aead_cmac () {
msg "build: full config with non-accelerated cipher inc. AEAD and CMAC" msg "build: full config with non-accelerated cipher inc. AEAD and CMAC"
common_psa_crypto_config_accel_cipher_aead_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 $MAKE_COMMAND
msg "test: full config with non-accelerated cipher inc. AEAD and CMAC" msg "test: full config with non-accelerated cipher inc. AEAD and CMAC"
@@ -2016,7 +2004,6 @@ component_build_aes_variations () {
scripts/config.py unset PSA_WANT_ALG_CBC_NO_PADDING 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_CBC_PKCS7
scripts/config.py unset PSA_WANT_ALG_ECB_NO_PADDING 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 \ build_test_config_combos ${BUILTIN_SRC_PATH}/aes.o validate_aes_config_variations \
"MBEDTLS_AES_ROM_TABLES" \ "MBEDTLS_AES_ROM_TABLES" \
@@ -2230,7 +2217,6 @@ config_block_cipher_no_decrypt () {
scripts/config.py unset PSA_WANT_ALG_CBC_NO_PADDING 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_CBC_PKCS7
scripts/config.py unset PSA_WANT_ALG_ECB_NO_PADDING 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 () { component_test_block_cipher_no_decrypt_aesni () {

4
tests/scripts/depends.py
View File

@@ -324,10 +324,6 @@ EXCLUSIVE_GROUPS = {
'-PSA_WANT_ALG_CCM', '-PSA_WANT_ALG_CCM',
'-PSA_WANT_ALG_GCM', '-PSA_WANT_ALG_GCM',
'-PSA_WANT_ALG_ECB_NO_PADDING'], '-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): def handle_exclusive_groups(config_settings, symbol):
"""For every symbol tested in an exclusive group check if there are other """For every symbol tested in an exclusive group check if there are other

1
tests/scripts/set_psa_test_dependencies.py
View File

@@ -53,7 +53,6 @@ CLASSIC_DEPENDENCIES = frozenset([
'MBEDTLS_CHACHAPOLY_C', 'MBEDTLS_CHACHAPOLY_C',
'MBEDTLS_CMAC_C', 'MBEDTLS_CMAC_C',
'MBEDTLS_CTR_DRBG_C', 'MBEDTLS_CTR_DRBG_C',
'MBEDTLS_DES_C',
'MBEDTLS_ECDH_C', 'MBEDTLS_ECDH_C',
'MBEDTLS_ECDSA_C', 'MBEDTLS_ECDSA_C',
'MBEDTLS_ECJPAKE_C', 'MBEDTLS_ECJPAKE_C',

2
tf-psa-crypto

Submodule tf-psa-crypto updated: 9a43f3fe86...092a54c678