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

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,7 +773,8 @@ impl SasState<Started> {
AcceptEventContent {
transaction_id: self.verification_flow_id.to_string(),
method: AcceptMethod::MSasV1(AcceptV1Content {
method: AcceptMethod::MSasV1(
AcceptV1ContentInit {
commitment: self.state.commitment.clone(),
hash: accepted_protocols.hash,
key_agreement_protocol: accepted_protocols.key_agreement_protocol,
@ -780,7 +784,9 @@ impl SasState<Started> {
.protocol_definitions
.short_authentication_string
.clone(),
}),
}
.into(),
),
}
}