logos-messaging/libchat
1
0
Fork 0
mirror of https://github.com/logos-messaging/libchat.git synced 2026-08-04 06:03:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-enable XWING (#193)

Browse Source
This commit is contained in:
Jazz Turner-Baggs 2026-07-28 21:14:33 -07:00 committed by GitHub
parent 4e350e255c
commit 71d3217e64
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/conversations/src/conversation/group_v1.rs
View File

@ -47,7 +47,7 @@ impl std::fmt::Debug for GroupV1Convo {
impl GroupV1Convo { impl GroupV1Convo {
// Create a new conversation with the creator as the only participant. // Create a new conversation with the creator as the only participant.
pub fn new<S: ExternalServices>(cx: &mut ServiceContext<S>) -> Result<Self, ChatError> { pub fn new<S: ExternalServices>(cx: &mut ServiceContext<S>) -> Result<Self, ChatError> {
let config = Self::mls_create_config(cx); let config = Self::mls_create_config();
let mls_group = MlsGroup::new( let mls_group = MlsGroup::new(
&cx.mls_provider, &cx.mls_provider,
&cx.mls_identity, &cx.mls_identity,
@ -114,9 +114,9 @@ impl GroupV1Convo {
Ok(()) Ok(())
} }
fn mls_create_config<S: ExternalServices>(cx: &mut ServiceContext<S>) -> MlsGroupCreateConfig { fn mls_create_config() -> MlsGroupCreateConfig {
MlsGroupCreateConfig::builder() MlsGroupCreateConfig::builder()
.ciphersuite(cx.mls_provider.crypto().supported_ciphersuites()[0]) .ciphersuite(crate::inbox_v2::CIPHER_SUITE)
.use_ratchet_tree_extension(true) // This is handy for now, until there is central store for this data .use_ratchet_tree_extension(true) // This is handy for now, until there is central store for this data
.build() .build()
} }

11
core/conversations/src/conversation/group_v2.rs
View File

@ -23,7 +23,6 @@ use openmls::extensions::{Extension, Extensions, UnknownExtension};
use openmls::group::MlsGroupCreateConfig; use openmls::group::MlsGroupCreateConfig;
use openmls::prelude::tls_codec::Deserialize as _; use openmls::prelude::tls_codec::Deserialize as _;
use openmls::prelude::{KeyPackageIn, OpenMlsProvider as _, ProtocolVersion}; use openmls::prelude::{KeyPackageIn, OpenMlsProvider as _, ProtocolVersion};
use openmls_traits::crypto::OpenMlsCrypto;
use prost::Message; use prost::Message;
use shared_traits::{IdentId, IdentIdRef}; use shared_traits::{IdentId, IdentIdRef};
use std::sync::Arc; use std::sync::Arc;
@ -108,11 +107,7 @@ fn rand_string(n: usize) -> String {
hex::encode(bytes) hex::encode(bytes)
} }
fn group_config<S: ExternalServices>( fn group_config(name: &str, desc: &str) -> MlsGroupCreateConfig {
cx: &mut ServiceContext<S>,
name: &str,
desc: &str,
) -> MlsGroupCreateConfig {
let meta = ConvoMetaInfo::new(name, desc); let meta = ConvoMetaInfo::new(name, desc);
let extensions = Extensions::from_vec(vec![Extension::Unknown( let extensions = Extensions::from_vec(vec![Extension::Unknown(
@ -122,7 +117,7 @@ fn group_config<S: ExternalServices>(
.expect("failed to create extensions"); .expect("failed to create extensions");
MlsGroupCreateConfig::builder() MlsGroupCreateConfig::builder()
.ciphersuite(cx.mls_provider.crypto().supported_ciphersuites()[0]) .ciphersuite(crate::inbox_v2::CIPHER_SUITE)
.capabilities(capabilities_with_group_metadata()) .capabilities(capabilities_with_group_metadata())
.use_ratchet_tree_extension(true) // Embed the ratchet tree in the Welcome so joiners can build the group .use_ratchet_tree_extension(true) // Embed the ratchet tree in the Welcome so joiners can build the group
.with_group_context_extensions(extensions) .with_group_context_extensions(extensions)
@ -136,7 +131,7 @@ impl GroupV2Convo {
desc: &str, desc: &str,
) -> Result<Self, ChatError> { ) -> Result<Self, ChatError> {
let convo_id = rand_string(5); let convo_id = rand_string(5);
let group_config = group_config(service_ctx, name, desc); let group_config = group_config(name, desc);
let conversation = Conversation::create( let conversation = Conversation::create(
&convo_id, &convo_id,
&member_id(service_ctx), &member_id(service_ctx),

3
core/conversations/src/inbox_v2.rs
View File

@ -26,9 +26,8 @@ use crate::service_context::{ExternalServices, ServiceContext};
use crate::utils::{blake2b_hex, hash_size}; use crate::utils::{blake2b_hex, hash_size};
use crate::{AddressedEnvelope, IdentId, IdentIdRef, IdentityProvider}; use crate::{AddressedEnvelope, IdentId, IdentIdRef, IdentityProvider};
// Downgraded from MLS_256_XWING_CHACHA20POLY1305_SHA256_Ed25519 until demls accepts an external provider
pub(crate) const CIPHER_SUITE: Ciphersuite = pub(crate) const CIPHER_SUITE: Ciphersuite =
Ciphersuite::MLS_128_DHKEMX25519_AES128GCM_SHA256_Ed25519; Ciphersuite::MLS_256_XWING_CHACHA20POLY1305_SHA256_Ed25519;
// Define unique Identifiers derivations used in InboxV2 // Define unique Identifiers derivations used in InboxV2
fn delivery_address_for(ident_id: IdentIdRef) -> String { fn delivery_address_for(ident_id: IdentIdRef) -> String {