jeans/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-08-10 12:27:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
J. Nick Koston
2025-06-27 06:30:51 -05:00
parent 6f07b54772
commit c40dff5d63
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,6 @@
#include <cerrno> #include <cerrno>
#include <cstdio> #include <cstdio>
#include <cstring>
namespace esphome { namespace esphome {
@@ -77,7 +76,7 @@ void ESPHomeOTAComponent::dump_config() {
" Version: %d", " Version: %d",
network::get_use_address().c_str(), this->port_, USE_OTA_VERSION); network::get_use_address().c_str(), this->port_, USE_OTA_VERSION);
#ifdef USE_OTA_PASSWORD #ifdef USE_OTA_PASSWORD
if (this->password_ != nullptr) { if (!this->password_.empty()) {
ESP_LOGCONFIG(TAG, " Password configured"); ESP_LOGCONFIG(TAG, " Password configured");
} }
#endif #endif
@@ -169,7 +168,7 @@ void ESPHomeOTAComponent::handle_() {
this->writeall_(buf, 1); this->writeall_(buf, 1);
#ifdef USE_OTA_PASSWORD #ifdef USE_OTA_PASSWORD
if (this->password_ != nullptr) { if (!this->password_.empty()) {
buf[0] = ota::OTA_RESPONSE_REQUEST_AUTH; buf[0] = ota::OTA_RESPONSE_REQUEST_AUTH;
this->writeall_(buf, 1); this->writeall_(buf, 1);
md5::MD5Digest md5{}; md5::MD5Digest md5{};
@@ -188,7 +187,7 @@ void ESPHomeOTAComponent::handle_() {
// prepare challenge // prepare challenge
md5.init(); md5.init();
md5.add(this->password_, strlen(this->password_)); md5.add(this->password_.c_str(), this->password_.length());
// add nonce // add nonce
md5.add(sbuf, 32); md5.add(sbuf, 32);

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

@@ -13,7 +13,7 @@ namespace esphome {
class ESPHomeOTAComponent : public ota::OTAComponent { class ESPHomeOTAComponent : public ota::OTAComponent {
public: public:
#ifdef USE_OTA_PASSWORD #ifdef USE_OTA_PASSWORD
void set_auth_password(const char *password) { password_ = password; } void set_auth_password(const std::string &password) { password_ = password; }
#endif // USE_OTA_PASSWORD #endif // USE_OTA_PASSWORD
/// Manually set the port OTA should listen on /// Manually set the port OTA should listen on
@@ -32,7 +32,7 @@ class ESPHomeOTAComponent : public ota::OTAComponent {
bool writeall_(const uint8_t *buf, size_t len); bool writeall_(const uint8_t *buf, size_t len);
#ifdef USE_OTA_PASSWORD #ifdef USE_OTA_PASSWORD
const char *password_{nullptr}; std::string password_;
#endif // USE_OTA_PASSWORD #endif // USE_OTA_PASSWORD
uint16_t port_; uint16_t port_;