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

make member

Browse Source
This commit is contained in:
J. Nick Koston
2025-09-19 17:00:03 -06:00
parent e41ca7e888
commit acb5616334
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,7 +120,7 @@ template<> struct HashTraits<sha256::SHA256> {
}; };
#endif #endif
template<typename HashClass> bool perform_hash_auth(ESPHomeOTAComponent *ota, const std::string &password) { template<typename HashClass> bool ESPHomeOTAComponent::perform_hash_auth_(const std::string &password) {
using Traits = HashTraits<HashClass>; using Traits = HashTraits<HashClass>;
// Minimize stack usage by reusing buffers // Minimize stack usage by reusing buffers
@@ -137,7 +137,7 @@ template<typename HashClass> bool perform_hash_auth(ESPHomeOTAComponent *ota, co
// Send auth request type // Send auth request type
buf[0] = Traits::AUTH_REQUEST; buf[0] = Traits::AUTH_REQUEST;
ota->writeall_(buf, 1); this->writeall_(buf, 1);
HashClass hasher; HashClass hasher;
hasher.init(); hasher.init();
@@ -173,7 +173,7 @@ template<typename HashClass> bool perform_hash_auth(ESPHomeOTAComponent *ota, co
ESP_LOGV("esphome.ota", "Auth: %s Nonce is %s", Traits::NAME, hex_buffer1); ESP_LOGV("esphome.ota", "Auth: %s Nonce is %s", Traits::NAME, hex_buffer1);
// Send nonce // Send nonce
if (!ota->writeall_(reinterpret_cast<uint8_t *>(hex_buffer1), Traits::HEX_SIZE)) { if (!this->writeall_(reinterpret_cast<uint8_t *>(hex_buffer1), Traits::HEX_SIZE)) {
ESP_LOGW("esphome.ota", "Auth: Writing %s nonce failed", Traits::NAME); ESP_LOGW("esphome.ota", "Auth: Writing %s nonce failed", Traits::NAME);
return false; return false;
} }
@@ -184,7 +184,7 @@ template<typename HashClass> bool perform_hash_auth(ESPHomeOTAComponent *ota, co
hasher.add(hex_buffer1, Traits::HEX_SIZE); // Add nonce hasher.add(hex_buffer1, Traits::HEX_SIZE); // Add nonce
// Receive cnonce into hex_buffer2 // Receive cnonce into hex_buffer2
if (!ota->readall_(reinterpret_cast<uint8_t *>(hex_buffer2), Traits::HEX_SIZE)) { if (!this->readall_(reinterpret_cast<uint8_t *>(hex_buffer2), Traits::HEX_SIZE)) {
ESP_LOGW("esphome.ota", "Auth: Reading %s cnonce failed", Traits::NAME); ESP_LOGW("esphome.ota", "Auth: Reading %s cnonce failed", Traits::NAME);
return false; return false;
} }
@@ -201,7 +201,7 @@ template<typename HashClass> bool perform_hash_auth(ESPHomeOTAComponent *ota, co
ESP_LOGV("esphome.ota", "Auth: %s Result is %s", Traits::NAME, hex_buffer1); ESP_LOGV("esphome.ota", "Auth: %s Result is %s", Traits::NAME, hex_buffer1);
// Receive response - reuse hex_buffer2 // Receive response - reuse hex_buffer2
if (!ota->readall_(reinterpret_cast<uint8_t *>(hex_buffer2), Traits::HEX_SIZE)) { if (!this->readall_(reinterpret_cast<uint8_t *>(hex_buffer2), Traits::HEX_SIZE)) {
ESP_LOGW("esphome.ota", "Auth: Reading %s response failed", Traits::NAME); ESP_LOGW("esphome.ota", "Auth: Reading %s response failed", Traits::NAME);
return false; return false;
} }

1
esphome/components/esphome/ota/ota_esphome.h
View File

@@ -30,6 +30,7 @@ class ESPHomeOTAComponent : public ota::OTAComponent {
protected: protected:
void handle_handshake_(); void handle_handshake_();
void handle_data_(); void handle_data_();
template<typename HashClass> bool perform_hash_auth_(const std::string &password);
bool readall_(uint8_t *buf, size_t len); bool readall_(uint8_t *buf, size_t len);
bool writeall_(const uint8_t *buf, size_t len); bool writeall_(const uint8_t *buf, size_t len);
void log_socket_error_(const LogString *msg); void log_socket_error_(const LogString *msg);