From 7e9baf27070b385c1b416abf1f4f526947ac581d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damir=20Jeli=C4=87?= Date: Thu, 26 Nov 2020 14:15:52 +0100 Subject: [PATCH 1/2] crypto: Remove some dead code definitions. --- matrix_sdk_crypto/src/olm/signing/mod.rs | 1 - matrix_sdk_crypto/src/olm/signing/pk_signing.rs | 1 - 2 files changed, 2 deletions(-) diff --git a/matrix_sdk_crypto/src/olm/signing/mod.rs b/matrix_sdk_crypto/src/olm/signing/mod.rs index 926ceab9..0e73f73e 100644 --- a/matrix_sdk_crypto/src/olm/signing/mod.rs +++ b/matrix_sdk_crypto/src/olm/signing/mod.rs @@ -135,7 +135,6 @@ impl PrivateCrossSigningIdentity { } /// Sign the given public user identity with this private identity. - #[allow(dead_code)] pub(crate) async fn sign_user( &self, user_identity: &UserIdentity, diff --git a/matrix_sdk_crypto/src/olm/signing/pk_signing.rs b/matrix_sdk_crypto/src/olm/signing/pk_signing.rs index 41cb182e..f653ebad 100644 --- a/matrix_sdk_crypto/src/olm/signing/pk_signing.rs +++ b/matrix_sdk_crypto/src/olm/signing/pk_signing.rs @@ -203,7 +203,6 @@ impl UserSigning { PickledUserSigning { pickle, public_key } } - #[allow(dead_code)] pub async fn sign_user( &self, user: &UserIdentity, From ce4d53a88c850f4a079c6c0fa25d7ffadea888e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damir=20Jeli=C4=87?= Date: Thu, 26 Nov 2020 14:27:11 +0100 Subject: [PATCH 2/2] examples: Feature gate the cross signing bootstrap example. --- matrix_sdk/examples/cross_signing_bootstrap.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/matrix_sdk/examples/cross_signing_bootstrap.rs b/matrix_sdk/examples/cross_signing_bootstrap.rs index b6a4e69f..5f910bf4 100644 --- a/matrix_sdk/examples/cross_signing_bootstrap.rs +++ b/matrix_sdk/examples/cross_signing_bootstrap.rs @@ -42,6 +42,7 @@ async fn bootstrap(client: Client, user_id: UserId, password: String) { .read_line(&mut input) .expect("error: unable to read user input"); + #[cfg(feature = "encryption")] if let Err(e) = client.bootstrap_cross_signing(None).await { if let Some(response) = e.uiaa_response() { 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); } } + + #[cfg(not(feature = "encryption"))] + panic!("Cross signing requires the encryption feature to be enabled"); } async fn login(