espressif/esp-matter
1
0
Fork 0
mirror of https://github.com/espressif/esp-matter.git synced 2026-04-27 11:03:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

update idf version to v5.2.1 for fixing Bootloader TOCTOU Vulnerability in Anti-rollback Scheme

Browse Source
This commit is contained in:
liyashuai
2024-04-02 14:26:36 +08:00
parent d592c3f827
commit 32e2f71e76
7 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/docker-image.yml
+1 -1
View File
@@ -30,7 +30,7 @@ env:
# Github runner is running out of space when we are building for multiple architectures in single runner
BUILD_PLATFORMS: linux/amd64
DOCKERHUB_REPO: ${{ github.repository }}
REQUIRED_IDF_VERSION: v5.1.2
REQUIRED_IDF_VERSION: v5.2.1
jobs:
build:
.gitlab-ci.yml
+4 -4
View File
@@ -170,7 +170,7 @@ variables:
- mkdir -p ${REPOS_PATH}
- *update_build_caches
variables:
IDF_VERSION: "v5.1.2"
IDF_VERSION: "v5.2.1"
REPOS_PATH: "$CI_PROJECT_DIR/repos"
IDF_CCACHE_ENABLE: 1
@@ -190,7 +190,7 @@ build_esp_matter_examples_pytest_C6_idf_v5_1:
when: always
expire_in: 4 days
variables:
IDF_VERSION: "v5.1.2"
IDF_VERSION: "v5.2.1"
script:
- cd ${ESP_MATTER_PATH}
- pip install -r tools/ci/requirements-build.txt
@@ -222,7 +222,7 @@ build_esp_matter_examples_pytest_H2_idf_v5_1:
when: always
expire_in: 4 days
variables:
IDF_VERSION: "v5.1.2"
IDF_VERSION: "v5.2.1"
script:
- *setup_ot_rcp
- *setup_ot_br
@@ -245,7 +245,7 @@ build_esp_matter_examples_non_pytest_idf_v5_1:
when: always
expire_in: 4 days
variables:
IDF_VERSION: "v5.1.2"
IDF_VERSION: "v5.2.1"
script:
- *build_external_platform_example
- *build_esp32c6_thread_example
README.md
+1 -1
View File
@@ -29,7 +29,7 @@ section in the ESP-Matter Programming Guide.
## Supported ESP-IDF and connectedhomeip versions
- This SDK currently works with commit [d38a6496c3](https://github.com/project-chip/connectedhomeip/tree/d38a6496c3) of connectedhomeip.
- For Matter projects development with this SDK, it is recommended to utilize ESP-IDF [v5.1.2](https://github.com/espressif/esp-idf/tree/v5.1.2).
- For Matter projects development with this SDK, it is recommended to utilize ESP-IDF [v5.2.1](https://github.com/espressif/esp-idf/tree/v5.2.1).
## Documentation
docs/en/developing.rst
+12 -12
View File
@@ -34,7 +34,7 @@ Development on Windows is supported using Windows Subsystem for Linux (WSL). Ple
- Windows does not support exposing COM ports to WSL distros. Install usbipd-win on `Windows <https://github.com/dorssel/usbipd-win>`__
and `WSL <https://github.com/espressif/vscode-esp-idf-extension/blob/master/docs/WSL.md#usbipd>`__ (usbipd-win `WSL Support <https://github.com/dorssel/usbipd-win/wiki/WSL-support>`__).
- Here onwards process for setting esp-matter and building examples is same as other hosts.
- Please clone the repositories from inside the WSL environment and not inside a mounted directory.
- Please clone the repositories from inside the WSL environment and not inside a mounted directory.
For using CHIP tool on WSL, please check `Using CHIP-tool in WSL <https://github.com/espressif/esp-matter/blob/main/docs/en/using_chip_tool.rst>`__.
@@ -43,7 +43,7 @@ For using VSCode for development, please check `Developing in WSL <https://code.
.. toctree::
:hidden:
:maxdepth: 1
Using CHIP-tool in WSL <using_chip_tool>
2.1.2 Getting the Repositories
@@ -66,7 +66,7 @@ Cloning esp-idf:
::
git clone --recursive https://github.com/espressif/esp-idf.git
cd esp-idf; git checkout v5.1.2; git submodule update --init --recursive;
cd esp-idf; git checkout v5.2.1; git submodule update --init --recursive;
./install.sh
cd ..
@@ -248,7 +248,7 @@ Choose IDF target.
::
ERROR: This script was called from a virtual environment, can not create a virtual environment again
It can be fixed by running below command:
::
@@ -646,14 +646,14 @@ creating in the *app_main.cpp* of the example. Examples:
- on_off_light:
::
on_off_light::config_t light_config;
endpoint_t *endpoint = on_off_light::create(node, &light_config, ENDPOINT_FLAG_NONE);
- fan:
::
fan::config_t fan_config;
endpoint_t *endpoint = fan::create(node, &fan_config, ENDPOINT_FLAG_NONE);
@@ -691,7 +691,7 @@ creating in the *app_main.cpp* of the example. Examples:
2.4.2.2 Clusters
^^^^^^^^^^^^^^^^
Additional clusters can also be added to an endpoint. Examples:
Additional clusters can also be added to an endpoint. Examples:
- on_off:
@@ -710,7 +710,7 @@ Additional clusters can also be added to an endpoint. Examples:
- window_covering:
::
window_covering::config_t window_covering_config(static_cast<uint8_t>(chip::app::Clusters::WindowCovering::EndProductType::kTiltOnlyInteriorBlind));
cluster_t *cluster = window_covering::create(endpoint, &window_covering_config, CLUSTER_FLAG_SERVER);
@@ -733,7 +733,7 @@ Additional clusters can also be added to an endpoint. Examples:
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Additional attributes and commands can also be added to a cluster.
Examples:
Examples:
- attribute: on_off:
@@ -793,19 +793,19 @@ Non-Standard endpoint can be created, without any clusters.
2.4.3.2 Clusters
^^^^^^^^^^^^^^^^
Non-Standard/Custom clusters can also be created:
Non-Standard/Custom clusters can also be created:
- Cluster create:
::
uint32_t custom_cluster_id = 0x131bfc00;
cluster_t *cluster = cluster::create(endpoint, custom_cluster_id, CLUSTER_FLAG_SERVER);
2.4.3.3 Attributes and Commands
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Non-Standard/Custom attributes can also be created on any cluster:
Non-Standard/Custom attributes can also be created on any cluster:
- Attribute create:
docs/en/security.rst
+1 -1
View File
@@ -1,7 +1,7 @@
5. Security Considerations
==========================
{IDF_TARGET_RELEASE:default="v5.1.2"}
{IDF_TARGET_RELEASE:default="v5.2.1"}
5.1 Overview
------------
examples/all_device_types_app/main/esp_matter_console_helpers.cpp
+13 -9
View File
@@ -77,10 +77,14 @@ static void initialize_console(void)
.source_clk = UART_SCLK_XTAL,
#endif
};
#if (CONFIG_ESP_CONSOLE_UART_NUM == 0)
uart_port_t uart_port = UART_NUM_0;
#elif (CONFIG_ESP_CONSOLE_UART_NUM == 1)
uart_port_t uart_port = UART_NUM_1;
#endif
/* Install UART driver for interrupt-driven reads and writes */
ESP_ERROR_CHECK( uart_driver_install(CONFIG_ESP_CONSOLE_UART_NUM,
256, 0, 0, NULL, 0) );
ESP_ERROR_CHECK( uart_param_config(CONFIG_ESP_CONSOLE_UART_NUM, &uart_config) );
ESP_ERROR_CHECK( uart_driver_install(uart_port, 256, 0, 0, NULL, 0) );
ESP_ERROR_CHECK( uart_param_config(uart_port, &uart_config) );
/* Tell VFS to use UART driver */
esp_vfs_dev_uart_use_driver(CONFIG_ESP_CONSOLE_UART_NUM);
@@ -369,7 +373,7 @@ int create(uint8_t device_type_index)
break;
}
}
if (!endpoint) {
ESP_LOGE(TAG, "Matter create endpoint failed");
return 1;
@@ -387,7 +391,7 @@ int create(uint8_t device_type_index)
xSemaphoreGive(semaphoreHandle);
}
}
return 0;
}
@@ -402,7 +406,7 @@ namespace console {
struct arg_str *device_type;
struct arg_end *end;
} create_device_args;
static int create(int argc, char **argv)
{
int nerrors = arg_parse(argc, argv, (void **) &create_device_args);
@@ -441,11 +445,11 @@ esp_err_t register_create_device_commands()
};
return esp_console_cmd_register(&create_cmd);
}
void init(void)
{
{
#if CONFIG_STORE_HISTORY
initialize_filesystem();
ESP_LOGI(TAG, "Command history enabled");
@@ -513,7 +517,7 @@ void init(void)
}
void deinit(void)
{
{
fflush(stdout);
fsync(fileno(stdout));
esp_console_deinit();
examples/controller/main/esp_ot_config.h
+1 -1
View File
@@ -28,7 +28,7 @@
{ \
.radio_mode = RADIO_MODE_UART_RCP, \
.radio_uart_config = { \
.port = UART_NUM_1, \
.port = UART_NUM_1, \
.uart_config = \
{ \
.baud_rate = 460800, \