From 5266ffcaf3ede4bf1f04d52a2254a6ddce4db858 Mon Sep 17 00:00:00 2001
From: overkillfpv <t.hitchins@exemail.com.au>
Date: Mon, 20 Apr 2026 21:10:16 +1000
Subject: [PATCH] fix: update ChanNameFilter secret size to match PUB_KEY_SIZE

---
 examples/simple_repeater/MyMesh.cpp | 6 ++++--
 examples/simple_repeater/MyMesh.h   | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/examples/simple_repeater/MyMesh.cpp b/examples/simple_repeater/MyMesh.cpp
index 8513b717..5b532d1d 100644
--- a/examples/simple_repeater/MyMesh.cpp
+++ b/examples/simple_repeater/MyMesh.cpp
@@ -709,11 +709,13 @@ void MyMesh::saveBlacklist(const char* fname, const BlacklistEntry* list) {
 /* ------------------- Channel name filter helpers -------------------------- */
 
 void MyMesh::deriveChanNameFilter(ChanNameFilter& entry, const char* name) {
-  // Derive channel secret: first 16 bytes of sha256(name)
+  // Derive channel secret: first 16 bytes of sha256(name), zero-padded to PUB_KEY_SIZE
+  // to match GroupChannel.secret layout (MACThenDecrypt reads PUB_KEY_SIZE bytes)
   uint8_t full_hash[32];
   mesh::Utils::sha256(full_hash, 32, (const uint8_t*)name, strlen(name));
+  memset(entry.secret, 0, sizeof(entry.secret));
   memcpy(entry.secret, full_hash, CIPHER_KEY_SIZE);
-  // Derive channel hash from the secret
+  // Derive channel hash from the secret (using 16-byte key length, matching addChannel)
   mesh::Utils::sha256(entry.hash, sizeof(entry.hash), entry.secret, CIPHER_KEY_SIZE);
   StrHelper::strncpy(entry.name, name, sizeof(entry.name));
 }
diff --git a/examples/simple_repeater/MyMesh.h b/examples/simple_repeater/MyMesh.h
index 0466ed3e..a0312bd0 100644
--- a/examples/simple_repeater/MyMesh.h
+++ b/examples/simple_repeater/MyMesh.h
@@ -72,7 +72,7 @@ struct BlacklistEntry {
 
 struct ChanNameFilter {
   uint8_t hash[PATH_HASH_SIZE];
-  uint8_t secret[CIPHER_KEY_SIZE];
+  uint8_t secret[PUB_KEY_SIZE];
   char    name[32];
 };