jeka/utun2
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Build DM identity module and reject conflicting group keys

Browse Source
This commit is contained in:
evgeny committed 2026-11-03 12:07:47 +01:00
1 parent 58896d179e
commit 26c8f7aa5a
2 files changed
+10 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Makefile.am
+4
View File
@@ -204,6 +204,8 @@ utun_CORE_SOURCES = \
chat/chat_headless_control.c \
chat/chat_whisper.h \
dm/dm_core.c \
dm/dm_identity.c \
dm/dm_identity.h \
dm/dm_history.c \
dm/dm_history.h \
dm/dm_crypto.c \
@@ -405,6 +407,8 @@ libutun_a_SOURCES = \
chat/chat_whisper.c \
chat/chat_whisper.h \
dm/dm_core.c \
dm/dm_identity.c \
dm/dm_identity.h \
dm/dm_history.c \
dm/dm_history.h \
dm/dm_crypto.c \
src/dm/dm_identity.c
+6 -1
View File
@@ -65,12 +65,15 @@ int dm_party_resolve(struct UTUN_INSTANCE* inst, uint64_t node, enum dm_mode mod
}
} else {
sqlite3_stmt* st = NULL;
uint8_t member_x[32] = {0}; int member_x_size = 0;
int rc = sqlite3_prepare_v2(inst->topo_sqlite_db,
"SELECT x25519_pubkey,ed25519_pubkey FROM nodes WHERE node_id=?", -1, &st, NULL);
"SELECT x25519_pubkey,ed25519_pubkey,devgroup_x FROM nodes WHERE node_id=?", -1, &st, NULL);
if (rc == SQLITE_OK) rc = sqlite3_bind_int64(st, 1, (sqlite3_int64)node);
if (rc == SQLITE_OK) rc = sqlite3_step(st);
if (rc == SQLITE_ROW && sqlite3_column_bytes(st, 0) == 32 && sqlite3_column_bytes(st, 1) == 32) {
memcpy(party.x, sqlite3_column_blob(st, 0), 32); memcpy(party.ed, sqlite3_column_blob(st, 1), 32);
member_x_size = sqlite3_column_bytes(st, 2);
if (member_x_size == 32) memcpy(member_x, sqlite3_column_blob(st, 2), 32);
} else {
sqlite3_finalize(st);
return identity_error(inst, "missing or damaged device keys", node);
@@ -85,6 +88,8 @@ int dm_party_resolve(struct UTUN_INSTANCE* inst, uint64_t node, enum dm_mode mod
struct devgroup_record record; struct devgroup_profile profile;
if (devgroup_latest(inst->topo_sqlite_db, id, &record, &profile) != 1)
return identity_error(inst, "subgroup profile unavailable", node);
if (member_x_size != 32 || memcmp(member_x, record.x, 32))
return identity_error(inst, "subgroup profile and membership use different encryption keys", node);
party.kind = DM_PARTY_GROUP; party.node = 0;
memcpy(party.ed, record.ed, 32); memcpy(party.x, record.x, 32);
}