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

Merge branch 'master' into new-state-store

master
Damir Jelić 2020-11-26 15:18:38 +01:00
parent 43ced3d279 ce4d53a88c
commit fcb50956bb
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
matrix_sdk/examples/cross_signing_bootstrap.rs
View File

@ -42,6 +42,7 @@ async fn bootstrap(client: Client, user_id: UserId, password: String) {
.read_line(&mut input) .read_line(&mut input)
.expect("error: unable to read user input"); .expect("error: unable to read user input");
#[cfg(feature = "encryption")]
if let Err(e) = client.bootstrap_cross_signing(None).await { if let Err(e) = client.bootstrap_cross_signing(None).await {
if let Some(response) = e.uiaa_response() { if let Some(response) = e.uiaa_response() {
let auth_data = auth_data(&user_id, &password, response.session.as_deref()); let auth_data = auth_data(&user_id, &password, response.session.as_deref());
@ -53,6 +54,9 @@ async fn bootstrap(client: Client, user_id: UserId, password: String) {
panic!("Error durign cross signing bootstrap {:#?}", e); panic!("Error durign cross signing bootstrap {:#?}", e);
} }
} }
#[cfg(not(feature = "encryption"))]
panic!("Cross signing requires the encryption feature to be enabled");
} }
async fn login( async fn login(

1
matrix_sdk_crypto/src/olm/signing/mod.rs
View File

@ -135,7 +135,6 @@ impl PrivateCrossSigningIdentity {
} }
/// Sign the given public user identity with this private identity. /// Sign the given public user identity with this private identity.
#[allow(dead_code)]
pub(crate) async fn sign_user( pub(crate) async fn sign_user(
&self, &self,
user_identity: &UserIdentity, user_identity: &UserIdentity,

1
matrix_sdk_crypto/src/olm/signing/pk_signing.rs
View File

@ -203,7 +203,6 @@ impl UserSigning {
PickledUserSigning { pickle, public_key } PickledUserSigning { pickle, public_key }
} }
#[allow(dead_code)]
pub async fn sign_user( pub async fn sign_user(
&self, &self,
user: &UserIdentity, user: &UserIdentity,