char
/
matrix-rust-sdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

crypto: Update to the latest Ruma changes.

master
Damir Jelić 2020-07-31 12:05:07 +02:00
parent a71c7b2964
commit 7ceda2f39c
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
matrix_sdk_crypto/src/verification/sas.rs
View File

@ -23,7 +23,10 @@ use matrix_sdk_common::{
api::r0::to_device::send_event_to_device::Request as ToDeviceRequest, api::r0::to_device::send_event_to_device::Request as ToDeviceRequest,
events::{ events::{
key::verification::{ key::verification::{
accept::{AcceptEventContent, AcceptMethod, MSasV1Content as AcceptV1Content}, accept::{
AcceptEventContent, AcceptMethod, MSasV1Content as AcceptV1Content,
MSasV1ContentInit as AcceptV1ContentInit,
},
cancel::{CancelCode, CancelEventContent}, cancel::{CancelCode, CancelEventContent},
key::KeyEventContent, key::KeyEventContent,
mac::MacEventContent, mac::MacEventContent,
@ -770,17 +773,20 @@ impl SasState<Started> {
AcceptEventContent { AcceptEventContent {
transaction_id: self.verification_flow_id.to_string(), transaction_id: self.verification_flow_id.to_string(),
method: AcceptMethod::MSasV1(AcceptV1Content { method: AcceptMethod::MSasV1(
commitment: self.state.commitment.clone(), AcceptV1ContentInit {
hash: accepted_protocols.hash, commitment: self.state.commitment.clone(),
key_agreement_protocol: accepted_protocols.key_agreement_protocol, hash: accepted_protocols.hash,
message_authentication_code: accepted_protocols.message_auth_code, key_agreement_protocol: accepted_protocols.key_agreement_protocol,
short_authentication_string: self message_authentication_code: accepted_protocols.message_auth_code,
.state short_authentication_string: self
.protocol_definitions .state
.short_authentication_string .protocol_definitions
.clone(), .short_authentication_string
}), .clone(),
}
.into(),
),
} }
} }