mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-07 23:44:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

crypto: Optimize OutboundGroupSession::encrypt

Browse Source
This commit is contained in:
Jonas Platte
2023-10-31 12:57:46 +01:00
committed by Jonas Platte
parent 7d52322687
commit d042bcce04
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
crates/matrix-sdk-crypto/src/olm/group_sessions/outbound.rs
View File

@@ -33,7 +33,6 @@ use ruma::{
SecondsSinceUnixEpoch, TransactionId, UserId,
};
use serde::{Deserialize, Serialize};
use serde_json::json;
use tokio::sync::RwLock;
use tracing::{debug, error, info};
use vodozemac::{megolm::SessionConfig, Curve25519PublicKey};
@@ -373,16 +372,23 @@ impl OutboundGroupSession {
event_type: &str,
content: &Raw<AnyMessageLikeEventContent>,
) -> Raw<RoomEncryptedEventContent> {
let json_content = json!({
"content": content,
"room_id": &*self.room_id,
"type": event_type,
});
#[derive(Serialize)]
struct Payload<'a> {
#[serde(rename = "type")]
event_type: &'a str,
content: &'a Raw<AnyMessageLikeEventContent>,
room_id: &'a RoomId,
}
let plaintext = json_content.to_string();
let relates_to = json_content["content"].get("m.relates_to").cloned();
let payload = Payload { event_type, content, room_id: &self.room_id };
let payload_json =
serde_json::to_string(&payload).expect("payload serialization never fails");
let ciphertext = self.encrypt_helper(plaintext).await;
let relates_to = content
.get_field::<serde_json::Value>("m.relates_to")
.expect("serde_json::Value deserialization with valid JSON input never fails");
let ciphertext = self.encrypt_helper(payload_json).await;
let scheme: RoomEventEncryptionScheme = match self.settings.algorithm {
EventEncryptionAlgorithm::MegolmV1AesSha2 => MegolmV1AesSha2Content {
ciphertext,