Merge branch 'bugfix/disable_hardware_encrp_for_s3' into 'master'

temporarily disable hardware encryption for esp32s3

See merge request espressif/esp-idf!12187
This commit is contained in:
Jiang Jiang Jian 2021-01-28 22:07:48 +08:00
commit 3af715ddd8
3 changed files with 8 additions and 4 deletions

View File

@ -222,6 +222,7 @@ menu "mbedTLS"
config MBEDTLS_HARDWARE_AES
bool "Enable hardware AES acceleration"
default n if IDF_TARGET_ESP32S3
default y
depends on !SPIRAM_CACHE_WORKAROUND_STRATEGY_DUPLDST
help
@ -254,6 +255,7 @@ menu "mbedTLS"
config MBEDTLS_HARDWARE_MPI
bool "Enable hardware MPI (bignum) acceleration"
default n if IDF_TARGET_ESP32S3
default y
depends on !SPIRAM_CACHE_WORKAROUND_STRATEGY_DUPLDST
help
@ -266,6 +268,7 @@ menu "mbedTLS"
config MBEDTLS_HARDWARE_SHA
bool "Enable hardware SHA acceleration"
default n if IDF_TARGET_ESP32S3
default y
depends on !SPIRAM_CACHE_WORKAROUND_STRATEGY_DUPLDST
help

View File

@ -37,7 +37,7 @@ void mbedtls_mpi_printf(const char *name, const mbedtls_mpi *X)
*/
static void test_bignum_mult_variant(const char *a_str, const char *b_str, const char *e_str, size_t mod_bits, int res_operands_overlap)
{
mbedtls_mpi A, B, X, E, M;
mbedtls_mpi A, B, X, E;
char x_buf[2048] = {0};
size_t x_buf_len = 0;
@ -65,6 +65,7 @@ static void test_bignum_mult_variant(const char *a_str, const char *b_str, const
TEST_ASSERT_EQUAL_STRING_MESSAGE(e_str, x_buf, "mbedtls_mpi_mul_mpi result wrong");
#ifdef CONFIG_MBEDTLS_HARDWARE_MPI
mbedtls_mpi M;
/* if mod_bits arg is set, also do a esp_mpi_mul_mod() call */
if (mod_bits > 0 && mod_bits <= SOC_RSA_MAX_BIT_LEN) {
mbedtls_mpi_init(&M);

View File

@ -880,9 +880,9 @@ CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_DEFAULT_FULL=y
# CONFIG_MBEDTLS_ECP_RESTARTABLE is not set
# CONFIG_MBEDTLS_CMAC_C is not set
CONFIG_MBEDTLS_HARDWARE_AES=y
CONFIG_MBEDTLS_HARDWARE_MPI=y
CONFIG_MBEDTLS_HARDWARE_SHA=y
# CONFIG_MBEDTLS_HARDWARE_AES is not set
# CONFIG_MBEDTLS_HARDWARE_MPI is not set
# CONFIG_MBEDTLS_HARDWARE_SHA is not set
# CONFIG_MBEDTLS_ATCA_HW_ECDSA_SIGN is not set
# CONFIG_MBEDTLS_ATCA_HW_ECDSA_VERIFY is not set
CONFIG_MBEDTLS_HAVE_TIME=y