Enable checks for encrypted flash in OTA #453
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Even if firmware is compiled without CONFIG_FLASH_ENCRYPTION_ENABLED Rayionale: CONFIG_FLASH_ENCRYPTION_ENABLED controls whether boot loader generates keys for encryption or not, but flash encryption can be configured externally. With this change, it's possible to have boot loader not generate keys but still have encryption working. Also fix use of it->part
| @@ -166,7 +163,7 @@ esp_err_t esp_ota_write(esp_ota_handle_t handle, const void *data, size_t size) | |||
| return ESP_OK; /* nothing to write yet, just filling buffer */ | |||
| } | |||
| /* write 16 byte to partition */ | |||
| ret = esp_partition_write(&it->part, it->wrote_size, it->partial_data, 16); | |||
| ret = esp_partition_write(it->part, it->wrote_size, it->partial_data, 16); | |||
There was a problem hiding this comment.
&it->part changed to it->part. Judging from the signature of esp_partition_write this wasn't compiling properly..
There was a problem hiding this comment.
yep. a drive-by fix. it generated a compilation warning that must've been overlooked. it could not have possibly worked.
igrr
added a commit
that referenced
this pull request
Apr 13, 2017
Enable checks for encrypted flash in OTA Even if firmware is compiled without CONFIG_FLASH_ENCRYPTION_ENABLED. Rationale: CONFIG_FLASH_ENCRYPTION_ENABLED controls whether boot loader generates keys for encryption or not, but flash encryption can be configured externally. With this change, it's possible to have boot loader not generate keys but still have encryption working. Also fix use of it->part Ref. #453 See merge request !647
|
Rebased and merged in a845f21, thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Even if firmware is compiled without CONFIG_FLASH_ENCRYPTION_ENABLED
Rayionale: CONFIG_FLASH_ENCRYPTION_ENABLED controls whether boot loader
generates keys for encryption or not, but flash encryption can be
configured externally. With this change, it's possible to have boot
loader not generate keys but still have encryption working.