diff options
| author | Gilles Peskine <Gilles.Peskine@arm.com> | 2020-02-26 18:56:08 +0100 |
|---|---|---|
| committer | Ronald Cron <ronald.cron@arm.com> | 2020-03-19 13:55:04 +0100 |
| commit | 4e1174967abee9b5c3bd50dbc2be2e466b634018 (patch) | |
| tree | 9a4850fdbbb2d7e0cec80f7d7952e777cf2abc05 /configs/config-no-entropy.h | |
| parent | 252e391cca6c11d161adec1b5424a831404f5949 (diff) | |
| download | mbedtls-4e1174967abee9b5c3bd50dbc2be2e466b634018.zip mbedtls-4e1174967abee9b5c3bd50dbc2be2e466b634018.tar.gz mbedtls-4e1174967abee9b5c3bd50dbc2be2e466b634018.tar.bz2 | |
Revert "config: Remove TLS and NET options"
This reverts commit 1c66e48670b64b2ac598576cc08df3a715f3957b.
Conflicts:
* include/mbedtls/check_config.h:
* MBEDTLS_SSL_PROTO_SSL3: there has been an addition (of
MBEDTLS_SHA512_NO_SHA384) at the place where it was removed. Re-add it
after (alphabetical order).
* MBEDTLS_ENABLE_WEAK_CIPHERSUITES: there has been an addition (of
MBEDTLS_CTR_DRBG_USE_128_BIT_KEY) at the place where it was removed.
Re-add it after (alphabetical order).
* MBEDTLS_SSL_ALL_ALERT_MESSAGES: there has been an addition (of
MBEDTLS_SHA512_SMALLER) at the place where it was removed. Re-add it
after (alphabetical order).
* include/mbedtls/config.h:
* MBEDTLS_ENABLE_WEAK_CIPHERSUITES: there has been an addition (of
MBEDTLS_CTR_DRBG_USE_128_BIT_KEY) at the place where it was removed.
Re-add it after (alphabetical order).
* MBEDTLS_SSL_ALL_ALERT_MESSAGES: there has been an addition (of
MBEDTLS_SHA512_SMALLER) at the place where it was removed. Re-add it
after (alphabetical order).
* library/version_features.c: re-generate by running
scripts/generate_features.pl.
* programs/test/query_config.c: re-generate by running
scripts/generate_query_config.pl.
* scripts/config.pl: this file has been replaced by config.py. Port
the reversed changes to config.py:
* Revert removing three symbols from the list of symbols to
exclude from full.
* Revert removing one symbol (MBEDTLS_NET_C) from the list of symbols
to exclude from baremetal.
* scripts/footprint.sh:
* Re-add the line to unset MBEDTLS_NET_C, but with config.py instead of
config.pl.
* tests/scripts/all.sh:
* component_test_no_platform: re-add the line to unset MBEDTLS_NET_C, but
with config.py instead of config.pl.
* component_build_arm_none_eabi_gcc,
component_build_arm_none_eabi_gcc_no_udbl_division,
component_build_arm_none_eabi_gcc_no_64bit_multiplication,
component_build_armcc: these components now use the baremetal
configuration, so they do not need to turn off MBEDTLS_NET_C explicitly.
Diffstat (limited to 'configs/config-no-entropy.h')
| -rw-r--r-- | configs/config-no-entropy.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configs/config-no-entropy.h b/configs/config-no-entropy.h index 433c663..d8cc1ab 100644 --- a/configs/config-no-entropy.h +++ b/configs/config-no-entropy.h @@ -41,6 +41,7 @@ /* mbed TLS feature support */ #define MBEDTLS_CIPHER_MODE_CBC #define MBEDTLS_CIPHER_PADDING_PKCS7 +#define MBEDTLS_REMOVE_ARC4_CIPHERSUITES #define MBEDTLS_ECP_DP_SECP256R1_ENABLED #define MBEDTLS_ECP_DP_SECP384R1_ENABLED #define MBEDTLS_ECP_DP_CURVE25519_ENABLED |