espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-05-23 01:58:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(ota): Add OTA binary link address verify of ESP8285 or ESP8266 + 1MB flash

Browse Source
This commit is contained in:
Dong Heng
2019-01-24 15:32:24 +08:00
parent df4c82f394
commit 2e9cb80033
3 changed files with 35 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
components/app_update/esp_ota_ops.c
View File

@ -69,6 +69,28 @@ static ota_select s_ota_select[2];
const static char *TAG = "esp_ota_ops"; const static char *TAG = "esp_ota_ops";
#ifndef CONFIG_ESP8266_BOOT_COPY_APP
static inline int esp_ota_verify_binary(const esp_partition_pos_t *pos, esp_image_header_t *image)
{
const int32_t entry = image->entry_addr - 0x40200010;
ESP_LOGD(TAG, "OTA binary start entry 0x%x, partition start from 0x%x to 0x%x\n", entry, pos->offset,
pos->offset + pos->size);
if (pos->offset + pos->size <= 0x100000) {
if (entry <= 0 || entry <= pos->offset || entry >= pos->offset + pos->size) {
const char *doc_str = "<<ESP8266_RTOS_SDK/examples/system/ota/README.md>>";
ESP_LOGE(TAG, "**Important**: The OTA binary link data is error, "
"please refer to document %s for how to generate OTA binaries", doc_str);
return ESP_ERR_INVALID_ARG;
}
}
return ESP_OK;
}
#endif
/* Return true if this is an OTA app partition */ /* Return true if this is an OTA app partition */
static bool is_ota_partition(const esp_partition_t *p) static bool is_ota_partition(const esp_partition_t *p)
{ {
@ -244,6 +266,13 @@ esp_err_t esp_ota_end(esp_ota_handle_t handle)
goto cleanup; goto cleanup;
} }
#ifndef CONFIG_ESP8266_BOOT_COPY_APP
if (esp_ota_verify_binary(&part_pos, &data.image) != ESP_OK) {
ret = ESP_ERR_OTA_VALIDATE_FAILED;
goto cleanup;
}
#endif
#ifdef CONFIG_SECURE_BOOT_ENABLED #ifdef CONFIG_SECURE_BOOT_ENABLED
ret = esp_secure_boot_verify_signature(it->part->address, data.image_len); ret = esp_secure_boot_verify_signature(it->part->address, data.image_len);
if (ret != ESP_OK) { if (ret != ESP_OK) {

10
components/esp8266/Makefile.projbuild
View File

@ -94,7 +94,7 @@ OTA_V2_TO_V3_BIN := ./build/$(PROJECT_NAME).v2_to_v3.ota.bin
CONFIG_APP2_OFFSET ?= $(CONFIG_APP1_OFFSET) CONFIG_APP2_OFFSET ?= $(CONFIG_APP1_OFFSET)
CONFIG_APP2_SIZE ?= $(CONFIG_APP1_SIZE) CONFIG_APP2_SIZE ?= $(CONFIG_APP1_SIZE)
OTA1_OFFSET := CONFIG_APP1_OFFSET OTA1_OFFSET := $(CONFIG_APP1_OFFSET)
ifdef CONFIG_ESP8266_BOOT_COPY_APP ifdef CONFIG_ESP8266_BOOT_COPY_APP
OTA2_LINK_OFFSET := $(CONFIG_APP1_OFFSET) OTA2_LINK_OFFSET := $(CONFIG_APP1_OFFSET)
else else
@ -102,7 +102,7 @@ OTA2_LINK_OFFSET := $(CONFIG_APP2_OFFSET)
endif endif
$(OTA2_BIN): all_binaries $(OTA2_BIN): all_binaries
ifeq ($(CONFIG_ESPTOOLPY_FLASHSIZE), "1MB") ifneq ($(OTA1_OFFSET), $(OTA2_LINK_OFFSET))
@rm -f ./build/esp8266/esp8266_out.ld @rm -f ./build/esp8266/esp8266_out.ld
@make APP_OFFSET=$(OTA2_LINK_OFFSET) APP_SIZE=$(CONFIG_APP2_SIZE) CFLAGS= CXXFLAGS= @make APP_OFFSET=$(OTA2_LINK_OFFSET) APP_SIZE=$(CONFIG_APP2_SIZE) CFLAGS= CXXFLAGS=
endif endif
@ -110,16 +110,16 @@ endif
@echo [GEN] $(OTA2_BIN) @echo [GEN] $(OTA2_BIN)
$(OTA1_BIN): all_binaries $(OTA1_BIN): all_binaries
ifeq ($(CONFIG_ESPTOOLPY_FLASHSIZE), "1MB") ifneq ($(OTA1_OFFSET), $(OTA2_LINK_OFFSET))
@rm -f ./build/esp8266/esp8266_out.ld @rm -f ./build/esp8266/esp8266_out.ld
endif endif
@make APP_OFFSET=$(CONFIG_APP1_OFFSET) APP_SIZE=$(CONFIG_APP1_SIZE) CFLAGS= CXXFLAGS= @make APP_OFFSET=$(OTA1_OFFSET) APP_SIZE=$(CONFIG_APP1_SIZE) CFLAGS= CXXFLAGS=
@cp $(RAW_BIN) $(OTA1_BIN) @cp $(RAW_BIN) $(OTA1_BIN)
@echo [GEN] $(OTA1_BIN) @echo [GEN] $(OTA1_BIN)
$(OTA_BIN): $(OTA1_BIN) $(OTA2_BIN) $(OTA_BIN): $(OTA1_BIN) $(OTA2_BIN)
@cp $(OTA1_BIN) $(OTA_BIN) @cp $(OTA1_BIN) $(OTA_BIN)
ifeq ($(CONFIG_ESPTOOLPY_FLASHSIZE), "1MB") ifneq ($(OTA1_OFFSET), $(OTA2_LINK_OFFSET))
@cat $(OTA2_BIN) >> $(OTA_BIN) @cat $(OTA2_BIN) >> $(OTA_BIN)
endif endif
@cp $(OTA1_BIN) $(RAW_BIN) @cp $(OTA1_BIN) $(RAW_BIN)

2
examples/system/ota/main/ota_example_main.c
View File

@ -185,7 +185,7 @@ bool _esp_ota_firm_parse_http(esp_ota_firm_t *ota_firm, const char *text, size_t
memset(length_str, 0, sizeof(length_str)); memset(length_str, 0, sizeof(length_str));
memcpy(length_str, ptr, ptr2 - ptr); memcpy(length_str, ptr, ptr2 - ptr);
ota_firm->content_len = atoi(length_str); ota_firm->content_len = atoi(length_str);
#ifdef CONFIG_ESPTOOLPY_FLASHSIZE_1MB #if defined(CONFIG_ESPTOOLPY_FLASHSIZE_1MB) && !defined(CONFIG_ESP8266_BOOT_COPY_APP)
ota_firm->ota_size = ota_firm->content_len / ota_firm->ota_num; ota_firm->ota_size = ota_firm->content_len / ota_firm->ota_num;
ota_firm->ota_offset = ota_firm->ota_size * ota_firm->update_ota_num; ota_firm->ota_offset = ota_firm->ota_size * ota_firm->update_ota_num;
#else #else