8000 Permit using the Updater _hash function, even if we don't have a signature appended to the image by einglis · Pull Request #8472 · esp8266/Arduino · GitHub
[go: up one dir, main page]
Skip to content

Permit using the Updater _hash function, even if we don't have a signature appended to the image #8472

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

Closed
wants to merge 5 commits into from
Closed

Permit using the Updater _hash function, even if we don't have a signature appended to the image #8472

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d62836a
Permit using the Updater _hash function, even if we don't have a sign…
einglis Jan 31, 2022
b716f81
Actioning review comment to use 'nullptr' instead of '0'
einglis Jan 31, 2022
5d162ce
Fixed a case where the last four bytes of data were not passed to the…
einglis Feb 2, 2022
baf251e
Merge branch 'esp8266:master' into master
einglis Mar 11, 2022
4b26625
Catch null pointer before it can be de-referenced
einglis Mar 11, 2022
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
Next Next commit
Permit using the Updater _hash function, even if we don't have a sign… 
…ature appended to the image
  • Loading branch information
@einglis
einglis committed Jan 31, 2022
commit d62836a9723f3a93e2e450ef474525e8b731acf4
38 changes: 23 additions & 15 deletions cores/esp8266/Updater.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,13 +224,17 @@ bool UpdaterClass::end(bool evenIfRemaining){
_size = progress();
}

uint32_t sigLen = 0;
if (_verify) {
ESP.flashRead(_startAddress + _size - sizeof(uint32_t), &sigLen, sizeof(uint32_t));
const uint32_t expectedSigLen = _verify->length();
uint32_t sigLen = 0;

if (expectedSigLen > 0) {
ESP.flashRead(_startAddress + _size - sizeof(uint32_t), &sigLen, sizeof(uint32_t));
}
#ifdef DEBUG_UPDATER
DEBUG_UPDATER.printf_P(PSTR("[Updater] sigLen: %d\n"), sigLen);
#endif
if (sigLen != _verify->length()) {
if (sigLen != expectedSigLen) {
_setError(UPDATE_ERROR_SIGN);
_reset();
return false;
Expand All @@ -255,20 +259,24 @@ bool UpdaterClass::end(bool evenIfRemaining){
for (int i=0; i<_hash->len(); i++) DEBUG_UPDATER.printf(" %02x", ret[i]);
DEBUG_UPDATER.printf("\n");
#endif
uint8_t *sig = (uint8_t*)malloc(sigLen);
if (!sig) {
_setError(UPDATE_ERROR_SIGN);
_reset();
return false;
}
ESP.flashRead(_startAddress + binSize, sig, sigLen);

uint8_t *sig = 0; // Safe to free if we don't actually malloc
if (expectedSigLen > 0) {
sig = (uint8_t*)malloc(sigLen);
if (!sig) {
_setError(UPDATE_ERROR_SIGN);
_reset();
return false;
}
ESP.flashRead(_startAddress + binSize, sig, sigLen);
#ifdef DEBUG_UPDATER
DEBUG_UPDATER.printf_P(PSTR("[Updater] Received Signature:"));
for (size_t i=0; i<sigLen; i++) {
DEBUG_UPDATER.printf(" %02x", sig[i]);
}
DEBUG_UPDATER.printf("\n");
DEBUG_UPDATER.printf_P(PSTR("[Updater] Received Signature:"));
for (size_t i=0; i<sigLen; i++) {
DEBUG_UPDATER.printf(" %02x", sig[i]);
}
DEBUG_UPDATER.printf("\n");
#endif
}
if (!_verify->verify(_hash, (void *)sig, sigLen)) {
free(sig);
_setError(UPDATE_ERROR_SIGN);
Expand Down
0