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

crypto: Don't allow dead code in the SAS layer anymore.

master
Damir Jelić 2020-08-14 11:09:50 +02:00
parent 499f2796ba
commit 5b758b8344
3 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
matrix_sdk_crypto/src/verification/mod.rs
View File

@ -13,7 +13,6 @@
// limitations under the License. // limitations under the License.
mod machine; mod machine;
#[allow(dead_code)]
mod sas; mod sas;
pub use machine::VerificationMachine; pub use machine::VerificationMachine;

8
matrix_sdk_crypto/src/verification/sas/mod.rs
View File

@ -540,14 +540,6 @@ impl InnerSas {
None None
} }
} }
fn verified_master_keys(&self) -> Option<Arc<Vec<String>>> {
if let InnerSas::Done(s) = self {
Some(s.verified_master_keys())
} else {
None
}
}
} }
#[cfg(test)] #[cfg(test)]

7
matrix_sdk_crypto/src/verification/sas/sas_state.rs
View File

@ -228,6 +228,7 @@ pub struct Canceled {
impl<S: Clone> SasState<S> { impl<S: Clone> SasState<S> {
/// Get our own user id. /// Get our own user id.
#[cfg(test)]
pub fn user_id(&self) -> &UserId { pub fn user_id(&self) -> &UserId {
&self.ids.account.user_id() &self.ids.account.user_id()
} }
@ -237,6 +238,7 @@ impl<S: Clone> SasState<S> {
&self.ids.account.device_id() &self.ids.account.device_id()
} }
#[cfg(test)]
pub fn other_device(&self) -> Device { pub fn other_device(&self) -> Device {
self.ids.other_device.clone() self.ids.other_device.clone()
} }
@ -780,11 +782,6 @@ impl SasState<Done> {
pub fn verified_devices(&self) -> Arc<Vec<Device>> { pub fn verified_devices(&self) -> Arc<Vec<Device>> {
self.state.verified_devices.clone() self.state.verified_devices.clone()
} }
/// Get the list of verified master keys.
pub fn verified_master_keys(&self) -> Arc<Vec<String>> {
self.state.verified_master_keys.clone()
}
} }
impl Canceled { impl Canceled {