Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update lib - User can choose if calc MD5 from encrypted or decrypted file #10510

Merged
merged 10 commits into from
Oct 24, 2024
Merged

Update lib - User can choose if calc MD5 from encrypted or decrypted file #10510

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7bfded6
User can choose if calc MD5 from decrypted file
zinkett Oct 23, 2024
0166ae3
md5
zinkett Oct 23, 2024
97e6c5d
Update Updater.cpp
zinkett Oct 23, 2024
f0b9247
Merge branch 'espressif:master' into master
zinkett Oct 23, 2024
6566f3d
Merge branch 'espressif:master' into master
zinkett Oct 24, 2024
1b8976f
Update libraries/Update/src/Update.h
zinkett Oct 24, 2024
dbe17d2
Update libraries/Update/src/Update.h
zinkett Oct 24, 2024
8bb73b9
Update libraries/Update/src/Updater.cpp
zinkett Oct 24, 2024
11ce752
Update libraries/Update/src/Updater.cpp
zinkett Oct 24, 2024
120edca
ci(pre-commit): Apply automatic fixes
pre-commit-ci-lite[bot] Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions libraries/Update/src/Update.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,9 @@ class UpdateClass {

/*
sets the expected MD5 for the firmware (hexString)
calc_post_decryption if true che update library calc MD5 after decryption, if false the calc is before decryption
zinkett marked this conversation as resolved.
Show resolved Hide resolved
*/
bool setMD5(const char *expected_md5);
bool setMD5(const char *expected_md5, bool calc_post_decryption);
zinkett marked this conversation as resolved.
Show resolved Hide resolved

/*
returns the MD5 String of the successfully ended firmware
Expand Down Expand Up @@ -256,8 +257,9 @@ class UpdateClass {
uint32_t _command;
const esp_partition_t *_partition;

String _target_md5;
MD5Builder _md5;
String _target_md5;
bool _target_md5_decrypted=true;
MD5Builder _md5;

int _ledPin;
uint8_t _ledOn;
Expand Down
14 changes: 11 additions & 3 deletions libraries/Update/src/Updater.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

#include "Update.h"
#include "Arduino.h"
#include "Arduino.h"
zinkett marked this conversation as resolved.
Show resolved Hide resolved
#include "spi_flash_mmap.h"
#include "esp_ota_ops.h"
#include "esp_image_format.h"
Expand Down Expand Up @@ -348,6 +348,11 @@ bool UpdateClass::_writeBuffer() {
log_d("Decrypting OTA Image");
}
}

if(!_target_md5_decrypted){
_md5.add(_buffer, _bufferLen);
}

//check if data in buffer needs decrypting
if (_cryptMode & U_AES_IMAGE_DECRYPTING_BIT) {
if (!_decryptBuffer()) {
Expand Down Expand Up @@ -404,7 +409,9 @@ bool UpdateClass::_writeBuffer() {
if (!_progress && _command == U_FLASH) {
_buffer[0] = ESP_IMAGE_HEADER_MAGIC;
}
_md5.add(_buffer, _bufferLen);
if(_target_md5_decrypted){
_md5.add(_buffer, _bufferLen);
}
_progress += _bufferLen;
_bufferLen = 0;
if (_progress_callback) {
Expand Down Expand Up @@ -446,12 +453,13 @@ bool UpdateClass::_verifyEnd() {
return false;
}

bool UpdateClass::setMD5(const char *expected_md5) {
bool UpdateClass::setMD5(const char *expected_md5, bool calc_post_decryption=true) {
zinkett marked this conversation as resolved.
Show resolved Hide resolved
if (strlen(expected_md5) != 32) {
return false;
}
_target_md5 = expected_md5;
_target_md5.toLowerCase();
_target_md5_decrypted=calc_post_decryption;
return true;
}

Expand Down