mirror of
https://github.com/liquidraver/ZephCore.git
synced 2026-10-15 19:51:14 +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
73 lines
1.6 KiB
C++
73 lines
1.6 KiB
C++
/*
|
|
* SPDX-License-Identifier: MIT
|
|
*/
|
|
|
|
#include "SHA256.h"
|
|
#include <string.h>
|
|
|
|
SHA256::SHA256() : _hash(PSA_HASH_OPERATION_INIT), _mac(PSA_MAC_OPERATION_INIT),
|
|
_key(PSA_KEY_ID_NULL), _hmac(false)
|
|
{
|
|
reset();
|
|
}
|
|
|
|
void SHA256::clear()
|
|
{
|
|
psa_hash_abort(&_hash);
|
|
psa_mac_abort(&_mac);
|
|
if (_key != PSA_KEY_ID_NULL) {
|
|
psa_destroy_key(_key);
|
|
_key = PSA_KEY_ID_NULL;
|
|
}
|
|
_hmac = false;
|
|
}
|
|
|
|
void SHA256::reset()
|
|
{
|
|
clear();
|
|
psa_hash_setup(&_hash, PSA_ALG_SHA_256);
|
|
}
|
|
|
|
void SHA256::update(const void *data, size_t len)
|
|
{
|
|
if (_hmac) {
|
|
psa_mac_update(&_mac, (const uint8_t *)data, len);
|
|
} else {
|
|
psa_hash_update(&_hash, (const uint8_t *)data, len);
|
|
}
|
|
}
|
|
|
|
void SHA256::finalize(void *hash, size_t len)
|
|
{
|
|
uint8_t out[32] = {0};
|
|
size_t out_len;
|
|
psa_hash_finish(&_hash, out, sizeof(out), &out_len);
|
|
memcpy(hash, out, len < sizeof(out) ? len : sizeof(out));
|
|
clear();
|
|
}
|
|
|
|
void SHA256::resetHMAC(const void *key, size_t keyLen)
|
|
{
|
|
clear();
|
|
psa_key_attributes_t attr = PSA_KEY_ATTRIBUTES_INIT;
|
|
psa_set_key_type(&attr, PSA_KEY_TYPE_HMAC);
|
|
psa_set_key_bits(&attr, keyLen * 8);
|
|
psa_set_key_usage_flags(&attr, PSA_KEY_USAGE_SIGN_MESSAGE);
|
|
psa_set_key_algorithm(&attr, PSA_ALG_HMAC(PSA_ALG_SHA_256));
|
|
if (psa_import_key(&attr, (const uint8_t *)key, keyLen, &_key) == PSA_SUCCESS) {
|
|
psa_mac_sign_setup(&_mac, _key, PSA_ALG_HMAC(PSA_ALG_SHA_256));
|
|
}
|
|
_hmac = true;
|
|
}
|
|
|
|
void SHA256::finalizeHMAC(const void *key, size_t keyLen, void *hash, size_t hashLen)
|
|
{
|
|
(void)key;
|
|
(void)keyLen;
|
|
uint8_t out[32] = {0};
|
|
size_t out_len;
|
|
psa_mac_sign_finish(&_mac, out, sizeof(out), &out_len);
|
|
memcpy(hash, out, hashLen < sizeof(out) ? hashLen : sizeof(out));
|
|
clear();
|
|
}
|