github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-08-30 09:36:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

[noise] Keep the resume KDF labels in PROGMEM on ESP8266

Browse Source
This commit is contained in:
J. Nick Koston
2026-08-24 16:50:28 -05:00
parent 46de7335b2
commit 2344929dae
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/noise/noise_resume.cpp
+5 -4
View File
@@ -4,13 +4,14 @@
#include <noise/protocol.h>
#include "esphome/core/hal.h"
#include "esphome/core/helpers.h"
namespace esphome::noise {
static constexpr char LABEL_OFFER[] = "offer";
static constexpr char LABEL_CONFIRM[] = "confirm";
static constexpr char LABEL_KEYS[] = "keys";
static const char LABEL_OFFER[] PROGMEM = "offer";
static const char LABEL_CONFIRM[] PROGMEM = "confirm";
static const char LABEL_KEYS[] PROGMEM = "keys";
// Largest KDF input: "keys" || client_nonce || server_nonce || SHA256(prologue)
static constexpr size_t RESUME_KDF_MAX_DATA = sizeof(LABEL_KEYS) - 1 + RESUME_NONCE_SIZE + RESUME_NONCE_SIZE + 32;
static_assert(sizeof(LABEL_CONFIRM) - 1 + RESUME_NONCE_SIZE + RESUME_NONCE_SIZE <= RESUME_KDF_MAX_DATA,
@@ -24,7 +25,7 @@ static bool resume_kdf(const uint8_t *secret, const char *label, size_t label_le
uint8_t data[RESUME_KDF_MAX_DATA];
uint8_t scratch[32];
size_t len = label_len + a_len + b_len;
std::memcpy(data, label, label_len); // NOLINT(bugprone-not-null-terminated-result)
progmem_memcpy(data, label, label_len);
std::memcpy(data + label_len, a, a_len);
std::memcpy(data + label_len + a_len, b, b_len);
NoiseHashState *hash = nullptr;