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

[noise] Keep two resume tickets

Browse Source
This commit is contained in:
J. Nick Koston
2026-08-24 14:39:15 -05:00
parent c2118778ee
commit 4e2ff94588
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/noise/noise_resume.h
+4 -1
View File
@@ -63,10 +63,13 @@ class ResumeTicketCache {
/// Forget every ticket (PSK change).
void clear();
// Realistically one or two controllers hold a ticket at a time; a third
// just evicts the oldest and that client does one full handshake.
static constexpr uint8_t SLOTS = 2;
protected:
bool take_verified_(const uint8_t *offer, uint8_t *secret_out);
static constexpr uint8_t SLOTS = 4;
ResumeTicket slots_[SLOTS];
bool used_[SLOTS]{};
uint8_t next_{0};
tests/components/noise/test_noise_resume.cpp
+4 -4
View File
@@ -160,7 +160,7 @@ TEST(NoiseResumeCache, BadMacOrMalformedOfferLeavesTicketIntact) {
TEST(NoiseResumeCache, IssueRotatesSlotsAndClearForgetsAll) {
ResumeTicketCache cache;
ResumeTicket tickets[5];
ResumeTicket tickets[ResumeTicketCache::SLOTS + 1];
for (auto &ticket : tickets) {
ASSERT_TRUE(cache.issue(ticket));
}
@@ -168,12 +168,12 @@ TEST(NoiseResumeCache, IssueRotatesSlotsAndClearForgetsAll) {
uint8_t prologue[1] = {0};
uint8_t ext[RESUME_ACCEPT_SIZE];
// Slot 0 was evicted by the fifth issue
// The oldest ticket was evicted by the one-past-capacity issue
build_offer_for_ticket(offer, tickets[0], KAT_CLIENT_NONCE);
NoiseCipherState *send = nullptr, *recv = nullptr;
EXPECT_FALSE(cache.try_accept(offer, sizeof(offer), prologue, sizeof(prologue), ext, send, recv));
// Tickets 1..4 remain redeemable
for (int i = 1; i < 5; i++) {
// The rest remain redeemable
for (int i = 1; i <= ResumeTicketCache::SLOTS; i++) {
build_offer_for_ticket(offer, tickets[i], KAT_CLIENT_NONCE);
EXPECT_TRUE(cache.try_accept(offer, sizeof(offer), prologue, sizeof(prologue), ext, send, recv));
noise_cipherstate_free(send);