Update media membership fixtures to join-bound certificates
This commit is contained in:
1 parent
7eb4450bef
commit
57a9afb63e
3 files changed
+3
-3
No files matched your search
@@ -38,7 +38,7 @@ static void put_member(unsigned destination, unsigned member) {
|
||||
int n = member_sync_build_join_msg(group_x, group_public, nodes[member]->node_id,
|
||||
nodes[member]->my_keys.public_key, 123, message, sizeof(message)); assert(n > 0);
|
||||
assert(sc_ed25519_sign(nodes[member]->my_ed25519_privkey, message, n, join) == SC_OK);
|
||||
assert(member_sync_sign_pubkey(group_private, nodes[member]->my_keys.public_key, tree) == 0);
|
||||
assert(member_sync_sign_join(group_private, join, tree) == 0);
|
||||
assert(member_sync_put(nodes[destination], CHANNEL, nodes[member]->node_id, nodes[member]->my_keys.public_key,
|
||||
nodes[member]->my_ed25519_pubkey, join, 123, NULL, 0, "{}", NULL, NULL, 0, 0, tree) >= 0);
|
||||
}
|
||||
|
||||
@@ -225,7 +225,7 @@ static int put_member(struct network_test* t, int destination, int member, int d
|
||||
member == SERVER ? "{\"storage\":\"yes\",\"ver\":\"1\"}" : "{\"ver\":\"1\"}";
|
||||
n = member_sync_build_owner_msg(t->ids[member], tags, msg, sizeof(msg));
|
||||
if (n < 0 || sc_ed25519_sign(t->channel_private, msg, n, tags_sig) != SC_OK ||
|
||||
member_sync_sign_pubkey(t->channel_private, t->keys[member].public_key, tree)) return -1;
|
||||
member_sync_sign_join(t->channel_private, join, tree)) return -1;
|
||||
char name[64]; snprintf(name, sizeof(name), "{\"name\":\"node%d\"}", member);
|
||||
return member_sync_put(t->nodes[destination], CHANNEL, t->ids[member], t->keys[member].public_key, t->ed[member],
|
||||
join, ts, NULL, 0, name, tags, tags_sig, member == SERVER, 0, tree) < 0 ? -1 : 0;
|
||||
|
||||
+1
-1
@@ -426,7 +426,7 @@ static void member_put_self(struct UTUN_INSTANCE* inst, const char* name) {
|
||||
int jl = member_sync_build_join_msg(g_sh.ch_x_pub, g_sh.ch_ed_pub, inst->node_id,
|
||||
inst->my_keys.public_key, join_ts, jm, (int)sizeof(jm));
|
||||
uint8_t join_sig[64]; sc_ed25519_sign(inst->my_ed25519_privkey, jm, (size_t)jl, join_sig);
|
||||
uint8_t tree_sig[64]; member_sync_sign_pubkey(g_sh.ch_ed_priv, inst->my_keys.public_key, tree_sig);
|
||||
uint8_t tree_sig[64]; member_sync_sign_join(g_sh.ch_ed_priv, join_sig, tree_sig);
|
||||
char userinfo[256]; snprintf(userinfo, sizeof(userinfo), "{\"name\":\"%s\"}", name);
|
||||
member_sync_put(inst, CH_ID, inst->node_id, inst->my_keys.public_key, inst->my_ed25519_pubkey,
|
||||
join_sig, join_ts, NULL, 0, userinfo, NULL, NULL, 0, 0, tree_sig);
|
||||
|
||||
Reference in new issue
Block a user