From b8ebb86352e7f46f75c75958fe72679cca696d2d Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Fri, 6 Nov 2020 14:48:41 +1100 Subject: [PATCH 1/4] esp_common: Add JIRA link to esp_efuse_mac_get_custom() --- components/esp_common/src/mac_addr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp_common/src/mac_addr.c b/components/esp_common/src/mac_addr.c index 772663acbc..89a5110c16 100644 --- a/components/esp_common/src/mac_addr.c +++ b/components/esp_common/src/mac_addr.c @@ -57,7 +57,7 @@ esp_err_t esp_base_mac_addr_get(uint8_t *mac) esp_err_t esp_efuse_mac_get_custom(uint8_t *mac) { #if !CONFIG_IDF_TARGET_ESP32 - return ESP_ERR_NOT_SUPPORTED; + return ESP_ERR_NOT_SUPPORTED; // TODO IDF-1326 #else uint8_t version; esp_efuse_read_field_blob(ESP_EFUSE_MAC_CUSTOM_VER, &version, 8); From 6a1959013271ff477bf3a9abd9fb8ab8187eab5a Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Fri, 6 Nov 2020 14:49:12 +1100 Subject: [PATCH 2/4] esp_wifi: Remove redundant comment --- components/esp_wifi/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/components/esp_wifi/CMakeLists.txt b/components/esp_wifi/CMakeLists.txt index ea11a9a2f8..329f35d34e 100644 --- a/components/esp_wifi/CMakeLists.txt +++ b/components/esp_wifi/CMakeLists.txt @@ -40,7 +40,6 @@ idf_component_register(SRCS "src/coexist.c" idf_build_get_property(build_dir BUILD_DIR) -# ToDo: Rename esp32s2beta to esp32s2 next time update wifi lib set(target_name "${idf_target}") target_link_libraries(${COMPONENT_LIB} PUBLIC "-L ${CMAKE_CURRENT_SOURCE_DIR}/lib/${target_name}") From a4fb6c017368fe2cdcf8c91f16a1a67a3c77464b Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Fri, 6 Nov 2020 14:49:57 +1100 Subject: [PATCH 3/4] mbedtls: Add missing sha_caps includes --- components/mbedtls/port/include/mbedtls/esp_config.h | 7 +++++++ components/mbedtls/test/test_mbedtls_mpi.c | 4 ++-- components/mbedtls/test/test_mbedtls_sha.c | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/components/mbedtls/port/include/mbedtls/esp_config.h b/components/mbedtls/port/include/mbedtls/esp_config.h index 60826e6c29..d1e6a910ed 100644 --- a/components/mbedtls/port/include/mbedtls/esp_config.h +++ b/components/mbedtls/port/include/mbedtls/esp_config.h @@ -29,6 +29,7 @@ #include "sdkconfig.h" #include "mbedtls/config.h" +#include "soc/soc_caps.h" /** * \name SECTION: System support @@ -130,7 +131,13 @@ #ifdef CONFIG_MBEDTLS_HARDWARE_SHA #define MBEDTLS_SHA1_ALT #define MBEDTLS_SHA256_ALT + +#if SOC_SHA_SUPPORT_SHA512 #define MBEDTLS_SHA512_ALT +#else +#undef MBEDTLS_SHA512_ALT +#endif + #else #undef MBEDTLS_SHA1_ALT #undef MBEDTLS_SHA256_ALT diff --git a/components/mbedtls/test/test_mbedtls_mpi.c b/components/mbedtls/test/test_mbedtls_mpi.c index 3b52304c82..a7b21a2f72 100644 --- a/components/mbedtls/test/test_mbedtls_mpi.c +++ b/components/mbedtls/test/test_mbedtls_mpi.c @@ -64,13 +64,13 @@ static void test_bignum_mult_variant(const char *a_str, const char *b_str, const mbedtls_mpi_write_string(&X, 16, x_buf, sizeof(x_buf)-1, &x_buf_len); TEST_ASSERT_EQUAL_STRING_MESSAGE(e_str, x_buf, "mbedtls_mpi_mul_mpi result wrong"); +#ifdef CONFIG_MBEDTLS_HARDWARE_MPI /* if mod_bits arg is set, also do a esp_mpi_mul_mod() call */ if (mod_bits > 0) { mbedtls_mpi_init(&M); for(int i = 0; i < mod_bits; i++) { mbedtls_mpi_set_bit(&M, i, 1); } - TEST_ASSERT_FALSE(esp_mpi_mul_mpi_mod(&X, &A, &B, &M)); mbedtls_mpi_write_string(&X, 16, x_buf, sizeof(x_buf)-1, &x_buf_len); @@ -78,7 +78,7 @@ static void test_bignum_mult_variant(const char *a_str, const char *b_str, const mbedtls_mpi_free(&M); } - +#endif mbedtls_mpi_free(&A); mbedtls_mpi_free(&B); diff --git a/components/mbedtls/test/test_mbedtls_sha.c b/components/mbedtls/test/test_mbedtls_sha.c index 46b7baef35..ee31268136 100644 --- a/components/mbedtls/test/test_mbedtls_sha.c +++ b/components/mbedtls/test/test_mbedtls_sha.c @@ -15,6 +15,7 @@ #include "sdkconfig.h" #include "test_apb_dport_access.h" #include "sodium/utils.h" +#include "soc/soc_caps.h" TEST_CASE("mbedtls SHA self-tests", "[mbedtls]") { @@ -369,7 +370,7 @@ TEST_CASE("mbedtls SHA, input in flash", "[mbedtls]") #if !DISABLED_FOR_TARGETS(ESP32) /* Function are not implemented in SW */ -#ifdef CONFIG_MBEDTLS_HARDWARE_SHA +#if CONFIG_MBEDTLS_HARDWARE_SHA && SOC_SHA_SUPPORT_SHA512_T /* * FIPS-180-2 test vectors From 61f4be45ec3d4251a687bfcde7452d26d0a76c98 Mon Sep 17 00:00:00 2001 From: Angus Gratton Date: Fri, 6 Nov 2020 14:50:46 +1100 Subject: [PATCH 4/4] fatfs: Make host sdkconfig compatible --- components/fatfs/test_fatfs_host/sdkconfig/sdkconfig.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/fatfs/test_fatfs_host/sdkconfig/sdkconfig.h b/components/fatfs/test_fatfs_host/sdkconfig/sdkconfig.h index 1c08df4ae4..2666177452 100644 --- a/components/fatfs/test_fatfs_host/sdkconfig/sdkconfig.h +++ b/components/fatfs/test_fatfs_host/sdkconfig/sdkconfig.h @@ -5,4 +5,4 @@ #define CONFIG_PARTITION_TABLE_OFFSET 0x8000 #define CONFIG_ESPTOOLPY_FLASHSIZE "8MB" //currently use the legacy implementation, since the stubs for new HAL are not done yet -#define CONFIG_SPI_FLASH_USE_LEGACY_IMPL +#define CONFIG_SPI_FLASH_USE_LEGACY_IMPL 1