sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-09-28 16:12:24 +01:00
Code Issues Releases Wiki Activity

stack it

Browse Source
This commit is contained in:
J. Nick Koston
2025-09-26 23:45:56 -05:00
parent 7e8de7c92c
commit 20cbc48ad4
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
esphome/components/esphome/ota/ota_esphome.cpp
View File

@@ -734,11 +734,14 @@ bool ESPHomeOTAComponent::prepare_auth_nonce_(HashBase *hasher) {
// Calculate required buffer size using the hasher // Calculate required buffer size using the hasher
const size_t hex_size = hasher->get_size() * 2; const size_t hex_size = hasher->get_size() * 2;
const size_t nonce_len = hasher->get_size() / 4; const size_t nonce_len = hasher->get_size() / 4;
// Buffer layout:
// - auth_type (1 byte) + nonce (hex_size) - sent in AUTH_SEND // Buffer layout after AUTH_READ completes:
// - cnonce (hex_size) + response (hex_size) - read in AUTH_READ at offset 1+hex_size // [0]: auth_type (1 byte)
// Total: 1 + hex_size + (hex_size * 2) // [1...hex_size]: nonce (hex_size bytes) - our random nonce sent in AUTH_SEND
const size_t auth_buf_size = 1 + hex_size + hex_size * 2; // [1+hex_size...1+2*hex_size-1]: cnonce (hex_size bytes) - client's nonce
// [1+2*hex_size...1+3*hex_size-1]: response (hex_size bytes) - client's hash
// Total: 1 + 3*hex_size
const size_t auth_buf_size = 1 + 3 * hex_size;
this->auth_buf_ = std::make_unique<uint8_t[]>(auth_buf_size); this->auth_buf_ = std::make_unique<uint8_t[]>(auth_buf_size);
this->auth_buf_pos_ = 0; this->auth_buf_pos_ = 0;
@@ -770,13 +773,7 @@ bool ESPHomeOTAComponent::prepare_auth_nonce_(HashBase *hasher) {
} }
bool ESPHomeOTAComponent::verify_hash_auth_(HashBase *hasher, size_t hex_size) { bool ESPHomeOTAComponent::verify_hash_auth_(HashBase *hasher, size_t hex_size) {
// Buffer layout after AUTH_READ completes: // Get pointers to the data in the buffer (see prepare_auth_nonce_ for buffer layout)
// [0]: auth_type (1 byte)
// [1...hex_size]: nonce (hex_size bytes) - our random nonce sent in AUTH_SEND
// [1+hex_size...1+2*hex_size-1]: cnonce (hex_size bytes) - client's nonce
// [1+2*hex_size...1+3*hex_size-1]: response (hex_size bytes) - client's hash
// Get pointers to the data in the buffer
char *nonce = reinterpret_cast<char *>(this->auth_buf_.get() + 1); // Skip auth_type byte char *nonce = reinterpret_cast<char *>(this->auth_buf_.get() + 1); // Skip auth_type byte
size_t cnonce_offset = 1 + hex_size; // Offset where cnonce starts in buffer size_t cnonce_offset = 1 + hex_size; // Offset where cnonce starts in buffer
char *cnonce = reinterpret_cast<char *>(this->auth_buf_.get() + cnonce_offset); char *cnonce = reinterpret_cast<char *>(this->auth_buf_.get() + cnonce_offset);