mirror of
https://github.com/liquidraver/ZephCore.git
synced 2026-10-15 15:19:59 +00:00
Server roles (slice 7) - CommonCLI split into upstream's shape; region CLI moved into CommonCLI; ClientACL, RegionMap, TransportKeyStore and both server meshes in upstream shape over an Arduino compat shim (helpers/compat: Arduino.h, Stream/Print, Serial, SHA256, FILESYSTEM/File over Zephyr fs) - room server processAck port; `get acl` prints as upstream - room: default name Room-XXXX, display/input rotation, live radio UI refresh Event loops (slice 7b) - repeater and room server share server_main_common with a ServerRole descriptor; shared event bits in src/mesh_events.h - room server deadline-driven (idle wakes 2.2/s -> 0.08/s); companion loop() runs on housekeeping (closes the lazy contact-flush gap) - `get loop.wakes` in debug builds (CONFIG_ZEPHCORE_LOOP_WAKE_STATS) Companion transports and WiFi (slice 8) - upstream MultiSerialInterface: BLE, USB/UART and TCP are each a BaseSerialInterface, every connected transport gets every frame; CompanionSerial holds a lossless reply; shared frame_txq for BLE/TCP - SerialCompanionTransport and LinuxTCPTransport replaced by TcpCompanionTransport; ZephyrBLE split (gatt layout, DFU) - WiFi companion (upstream wifi.ssid/pwd/enabled CLI, TCP port 5000) on boards declaring `capabilities: wifi` in zephcore.yml: the PSRAM ESP32-S3 boards, plus Heltec V3 (140 contacts), Wireless Tracker (130) and both C6 boards (280); ESP32-S3 without PSRAM gets bounded WiFi buffers and a measured 72 KB heap; PSRAM boards' internal heap 72 KB - TCP queues: own depth (ZEPHCORE_TCP_QUEUE_SIZE=8), RX waits instead of dropping - RAM: companion ClientACL dropped; main/BT-TX/TCP stacks sized from measured peaks (-7 KB nRF companions, -9 KB ESP32 companions) - ESP32 WiFi stopped working under ~200 frames/s unicast. Fixed by: patches/zephyr/0017 never block the WiFi task in the RX callback; patches/zephyr/0018 lock shared_multi_heap (heap corruption with the WiFi heap in PSRAM); patches/modules/hal_espressif/0001 backport of hal_espressif af97fb02df (PSRAM realloc) Storage and prefs (slice 9) - prefs are now prefs.json through upstream's ConfigSerializer (ported verbatim), with upstream's key names for shared fields and ZephCore's own under "zc"; on first boot the binary new_prefs / repeater prefs is migrated and kept, so a downgrade still boots with the old settings - helpers/PrefsCodec: both legacy binary layouts (companion 272 B, server 311 B) as Zephyr-free codecs; sanitizeNodePrefs is the only validator - fix: server prefs could be replaced by a truncated file when a write failed; identity, prefs and channel writes go through one checked atomic replace (ZephyrFsUtil) - fix: a corrupt cad_auto byte turned adaptive CAD off instead of the default on - fix: a deliberate 300 s GPS duty on a repeater was rewritten to 48 h on every boot (that migration now runs on legacy files only) - one identity loader for all roles (IdentityFile); an unusable key file is always parked as .bad before regenerating - server store no longer stamps repeater defaults on room server and observer; companion first-boot volume policy moved into the store (adoptVolume) - ZephyrDataStore 1435 -> ~850 lines
103 lines
4.2 KiB
C++
103 lines
4.2 KiB
C++
#pragma once
|
|
|
|
#include <mesh/MeshCore.h>
|
|
#include <Stream.h>
|
|
#include <string.h>
|
|
#include <stddef.h>
|
|
|
|
namespace mesh {
|
|
|
|
class RNG {
|
|
public:
|
|
virtual void random(uint8_t* dest, size_t sz) = 0;
|
|
|
|
/**
|
|
* \returns random number between _min (inclusive) and _max (exclusive)
|
|
*/
|
|
uint32_t nextInt(uint32_t _min, uint32_t _max);
|
|
};
|
|
|
|
class Utils {
|
|
public:
|
|
/**
|
|
* \brief calculates the SHA256 hash of 'msg', storing in 'hash' and truncating the hash to 'hash_len' bytes.
|
|
*/
|
|
static void sha256(uint8_t *hash, size_t hash_len, const uint8_t* msg, int msg_len);
|
|
|
|
/**
|
|
* \brief calculates the SHA256 hash of two fragments, 'frag1' and 'frag2' (in that order), storing in 'hash' and truncating.
|
|
*/
|
|
static void sha256(uint8_t *hash, size_t hash_len, const uint8_t* frag1, int frag1_len, const uint8_t* frag2, int frag2_len);
|
|
|
|
/**
|
|
* \brief Encrypts the 'src' bytes using AES128 cipher, using 'shared_secret' as key, with key length fixed at CIPHER_KEY_SIZE.
|
|
* Final block is padded with zero bytes before encrypt. Result stored in 'dest'.
|
|
* \returns The length in bytes put into 'dest'. (rounded up to block size)
|
|
*/
|
|
static int encrypt(const uint8_t* shared_secret, uint8_t* dest, const uint8_t* src, int src_len);
|
|
|
|
/**
|
|
* \brief Decrypt the 'src' bytes using AES128 cipher, using 'shared_secret' as key, with key length fixed at CIPHER_KEY_SIZE.
|
|
* 'src_len' should be multiple of block size, as returned by 'encrypt()'.
|
|
* \returns The length in bytes put into 'dest'. (dest may contain trailing zero bytes in final block)
|
|
*/
|
|
static int decrypt(const uint8_t* shared_secret, uint8_t* dest, const uint8_t* src, int src_len);
|
|
|
|
/**
|
|
* \brief encrypts bytes in src, then calculates MAC on ciphertext, inserting into leading bytes of 'dest'.
|
|
* \returns total length of bytes in 'dest' (MAC + ciphertext)
|
|
*/
|
|
static int encryptThenMAC(const uint8_t* shared_secret, uint8_t* dest, const uint8_t* src, int src_len);
|
|
|
|
/**
|
|
* \brief checks the MAC (in leading bytes of 'src'), then if valid, decrypts remaining bytes in src.
|
|
* \returns zero if MAC is invalid, otherwise the length of decrypted bytes in 'dest'
|
|
*/
|
|
static int MACThenDecrypt(const uint8_t* shared_secret, uint8_t* dest, const uint8_t* src, int src_len);
|
|
|
|
/**
|
|
* \brief converts 'src' bytes with given length to Hex representation, and null terminates.
|
|
*/
|
|
static void toHex(char* dest, const uint8_t* src, size_t len);
|
|
|
|
/**
|
|
* \brief converts 'src_hex' hexadecimal string (should be null term) back to raw bytes, storing in 'dest'.
|
|
* \param dest_size must be exactly the expected size in bytes.
|
|
* \returns true if successful
|
|
*/
|
|
static bool fromHex(uint8_t* dest, int dest_size, const char *src_hex);
|
|
|
|
/**
|
|
* \brief Prints the hexadecimal representation of 'src' bytes of given length, to Stream 's'.
|
|
*/
|
|
static void printHex(Stream& s, const uint8_t* src, size_t len);
|
|
|
|
/**
|
|
* \brief parse 'text' into parts separated by 'separator' char.
|
|
* \param text the text to parse (note is MODIFIED!)
|
|
* \param parts destination array to store pointers to starts of parse parts
|
|
* \param max_num max elements to store in 'parts' array
|
|
* \param separator the separator character
|
|
* \returns the number of parts parsed (in 'parts')
|
|
*/
|
|
static int parseTextParts(char* text, const char* parts[], int max_num, char separator=',');
|
|
|
|
static bool isHexChar(char c);
|
|
|
|
static bool isZeroes(const uint8_t* buf, size_t len);
|
|
|
|
// ZEPHCORE: crypto hygiene helpers.
|
|
// Constant-time equality: no early exit, so timing is independent of the
|
|
// input (MAC / password / secret compares). The volatile accumulator survives
|
|
// -Os LTO (disassembly-verified on Cortex-M4). Pattern from rweather/arduinolibs.
|
|
static bool constantTimeEqual(const void* a, const void* b, size_t n);
|
|
// Zero a buffer the compiler cannot elide as a dead store (key material, seeds,
|
|
// shared secrets after last use).
|
|
static void secureZeroize(void* buf, size_t n);
|
|
// An entropy source, KDF or other primitive could not produce a safe result:
|
|
// log and cold-reboot rather than risk weak keys or bypassed auth.
|
|
[[noreturn]] static void cryptoPanicReboot(const char* msg);
|
|
};
|
|
|
|
}
|