From ff87963f4141b13ef997a67e0d524d49c3c48b36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damir=20Jeli=C4=87?= Date: Thu, 11 Dec 2025 17:54:13 +0100 Subject: [PATCH 1/2] doc(encryption): Add a link to MSC4287 --- crates/matrix-sdk/src/encryption/recovery/types.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/crates/matrix-sdk/src/encryption/recovery/types.rs b/crates/matrix-sdk/src/encryption/recovery/types.rs index 820294c270f..7d22137a385 100644 --- a/crates/matrix-sdk/src/encryption/recovery/types.rs +++ b/crates/matrix-sdk/src/encryption/recovery/types.rs @@ -107,6 +107,10 @@ pub(super) struct SecretStorageDisabledContent {} /// A custom global account data event which tells us that a new backup should /// not be automatically created. +/// +/// This event is defined in [MSC4287]. +/// +/// [MSC4287]: https://github.com/matrix-org/matrix-spec-proposals/pull/4287 #[derive(Clone, Debug, Default, Deserialize, Serialize, EventContent)] #[ruma_event(type = "m.org.matrix.custom.backup_disabled", kind = GlobalAccountData)] pub(super) struct BackupDisabledContent { From 90cf2927295761d2b5d14f884927c48d26661206 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damir=20Jeli=C4=87?= Date: Thu, 11 Dec 2025 19:09:15 +0100 Subject: [PATCH 2/2] chore: Fix an incorrect warning due to the zeroize macro --- crates/matrix-sdk-crypto/src/secret_storage.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/crates/matrix-sdk-crypto/src/secret_storage.rs b/crates/matrix-sdk-crypto/src/secret_storage.rs index fc44ad5282d..842de5dc54d 100644 --- a/crates/matrix-sdk-crypto/src/secret_storage.rs +++ b/crates/matrix-sdk-crypto/src/secret_storage.rs @@ -17,6 +17,12 @@ //! //! [spec]: https://spec.matrix.org/v1.8/client-server-api/#storage +// This is here because we have a zeroize(skip) further below, which incorrectly triggers a +// unused_assignments warning due to the macro not using a variable. +// +// This will be fixed once we bump Zeroize. +#![allow(unused_assignments)] + use std::fmt; use hmac::Hmac;