Merge branch 'master' into new-state-store

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(

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,

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,