sdk-store-encryption: use ZeroizeOnDrop instead of [zeroize(drop)]

bnjbvr · bnjbvr · commit fbeb77ae3ee9 · 2024-07-02T14:33:19.000+02:00
One item of #3272.
diff --git a/crates/matrix-sdk-store-encryption/src/lib.rs b/crates/matrix-sdk-store-encryption/src/lib.rs
@@ -33,7 +33,7 @@ use pbkdf2::pbkdf2;
 use rand::{thread_rng, Error as RandomError, Fill};
 use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use sha2::Sha256;
-use zeroize::Zeroize;
+use zeroize::{Zeroize, ZeroizeOnDrop};
 
 const VERSION: u8 = 1;
 const KDF_SALT_SIZE: usize = 32;
@@ -774,8 +774,7 @@ impl StoreCipher {
     }
 }
 
-#[derive(Zeroize)]
-#[zeroize(drop)]
+#[derive(ZeroizeOnDrop)]
 struct MacKey(Box<[u8; 32]>);
 
 impl MacKey {
@@ -878,8 +877,7 @@ impl From<EncryptedValue> for EncryptedValueBase64 {
     }
 }
 
-#[derive(Zeroize)]
-#[zeroize(drop)]
+#[derive(ZeroizeOnDrop)]
 struct Keys {
     encryption_key: Box<[u8; 32]>,
     mac_key_seed: Box<MacKeySeed>,

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ use pbkdf2::pbkdf2;`
`33`	`33`	`use rand::{thread_rng, Error as RandomError, Fill};`
`34`	`34`	`use serde::{de::DeserializeOwned, Deserialize, Serialize};`
`35`	`35`	`use sha2::Sha256;`
`36`		`-use zeroize::Zeroize;`
	`36`	`+use zeroize::{Zeroize, ZeroizeOnDrop};`
`37`	`37`
`38`	`38`	`const VERSION: u8 = 1;`
`39`	`39`	`const KDF_SALT_SIZE: usize = 32;`
`@@ -774,8 +774,7 @@ impl StoreCipher {`
`774`	`774`	`}`
`775`	`775`	`}`
`776`	`776`
`777`		`-#[derive(Zeroize)]`
`778`		`-#[zeroize(drop)]`
	`777`	`+#[derive(ZeroizeOnDrop)]`
`779`	`778`	`struct MacKey(Box<[u8; 32]>);`
`780`	`779`
`781`	`780`	`impl MacKey {`
`@@ -878,8 +877,7 @@ impl From<EncryptedValue> for EncryptedValueBase64 {`
`878`	`877`	`}`
`879`	`878`	`}`
`880`	`879`
`881`		`-#[derive(Zeroize)]`
`882`		`-#[zeroize(drop)]`
	`880`	`+#[derive(ZeroizeOnDrop)]`
`883`	`881`	`struct Keys {`
`884`	`882`	`encryption_key: Box<[u8; 32]>,`
`885`	`883`	`mac_key_seed: Box<MacKeySeed>,`