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

crypto: Update to the latest Ruma changes.

Browse source
This commit is contained in:
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,
events::{
key::verification::{
accept::{AcceptEventContent, AcceptMethod, MSasV1Content as AcceptV1Content},
accept::{
AcceptEventContent, AcceptMethod, MSasV1Content as AcceptV1Content,
MSasV1ContentInit as AcceptV1ContentInit,
},
cancel::{CancelCode, CancelEventContent},
key::KeyEventContent,
mac::MacEventContent,
@ -770,17 +773,20 @@ impl SasState<Started> {
AcceptEventContent {
transaction_id: self.verification_flow_id.to_string(),
method: AcceptMethod::MSasV1(AcceptV1Content {
commitment: self.state.commitment.clone(),
hash: accepted_protocols.hash,
key_agreement_protocol: accepted_protocols.key_agreement_protocol,
message_authentication_code: accepted_protocols.message_auth_code,
short_authentication_string: self
.state
.protocol_definitions
.short_authentication_string
.clone(),
}),
method: AcceptMethod::MSasV1(
AcceptV1ContentInit {
commitment: self.state.commitment.clone(),
hash: accepted_protocols.hash,
key_agreement_protocol: accepted_protocols.key_agreement_protocol,
message_authentication_code: accepted_protocols.message_auth_code,
short_authentication_string: self
.state
.protocol_definitions
.short_authentication_string
.clone(),
}
.into(),
),
}
}