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

reduce magic numbers

Browse Source
This commit is contained in:
J. Nick Koston
2025-09-23 09:46:58 -05:00
parent 7e273879b5
commit 307ad1c18b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -533,7 +533,7 @@ bool ESPHomeOTAComponent::perform_hash_auth_(HashBase *hasher, const std::string
const LogString *name, char *buf) { const LogString *name, char *buf) {
// Get sizes from the hasher // Get sizes from the hasher
const size_t hex_size = hasher->get_size() * 2; // Hex is twice the byte size const size_t hex_size = hasher->get_size() * 2; // Hex is twice the byte size
const size_t nonce_hex_len = hasher->get_size() / 2; // Nonce hex length is 1/4 of full hex size const size_t nonce_len = hasher->get_size() / 4; // Nonce is 1/4 of hash size in bytes
// Use the provided buffer for all hex operations // Use the provided buffer for all hex operations
@@ -553,11 +553,11 @@ bool ESPHomeOTAComponent::perform_hash_auth_(HashBase *hasher, const std::string
nonce_bytes[2] = (r1 >> 8) & 0xFF; nonce_bytes[2] = (r1 >> 8) & 0xFF;
nonce_bytes[3] = r1 & 0xFF; nonce_bytes[3] = r1 & 0xFF;
if (nonce_hex_len == 8) { if (nonce_len == 4) {
// MD5: 8 chars = "%08x" format = 4 bytes from one random uint32 // MD5: 4 bytes from one random uint32
hasher->add(nonce_bytes, 4); hasher->add(nonce_bytes, 4);
} else { } else {
// SHA256: 16 chars = "%08x%08x" format = 8 bytes from two random uint32s // SHA256: 8 bytes from two random uint32s
uint32_t r2 = random_uint32(); uint32_t r2 = random_uint32();
nonce_bytes[4] = (r2 >> 24) & 0xFF; nonce_bytes[4] = (r2 >> 24) & 0xFF;
nonce_bytes[5] = (r2 >> 16) & 0xFF; nonce_bytes[5] = (r2 >> 16) & 0xFF;