π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Upgrade zeroize and use drop-only secret types
Manav Rathie3b5ea009aab
diff --git a/rust/Cargo.lock b/rust/Cargo.lockindex 82018edaa4..0e91b40537 100644--- a/rust/Cargo.lock+++ b/rust/Cargo.lock@@ -11499,18 +11499,18 @@ dependencies = [[[package]]name = "zeroize"-version = "1.8.2"+version = "1.9.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"+checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e"dependencies = ["zeroize_derive",][[package]]name = "zeroize_derive"-version = "1.4.3"+version = "1.5.0"source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e"+checksum = "3c50655cbb0fe3fc43170059e702f1ce5e19b84cec58dc87b037a09935c2f328"dependencies = ["proc-macro2","quote",diff --git a/rust/Cargo.toml b/rust/Cargo.tomlindex b9a6889352..194bcc04dd 100644--- a/rust/Cargo.toml+++ b/rust/Cargo.toml@@ -66,7 +66,7 @@ url = "2.5.8"urlencoding = "2.1.3"wasm-bindgen = "0.2.125"wasm-bindgen-futures = "0.4.75"-zeroize = { version = "1.8.2", features = ["derive"] }+zeroize = { version = "1.9.0", features = ["derive"] }# Unoptimized Argon2 makes production-strength derivations dominate test runtime.[profile.dev.package.argon2]diff --git a/rust/apps/cli/src/models/account.rs b/rust/apps/cli/src/models/account.rsindex fcae98277c..8c705b46b3 100644--- a/rust/apps/cli/src/models/account.rs+++ b/rust/apps/cli/src/models/account.rs@@ -1,6 +1,6 @@use serde::{Deserialize, Serialize};use std::{fmt, str::FromStr};-use zeroize::Zeroize;+use zeroize::ZeroizeOnDrop;#[derive(Debug, Clone, Serialize, Deserialize)]pub struct Account {@@ -61,8 +61,7 @@ impl Account {}}-#[derive(Serialize, Deserialize, Zeroize)]-#[zeroize(drop)]+#[derive(Serialize, Deserialize, ZeroizeOnDrop)]pub struct AccountSecrets {pub token: Vec<u8>,pub master_key: Vec<u8>,diff --git a/rust/crates/accounts/src/types.rs b/rust/crates/accounts/src/types.rsindex f58b6e89ca..114f7fb070 100644--- a/rust/crates/accounts/src/types.rs+++ b/rust/crates/accounts/src/types.rs@@ -1,6 +1,6 @@use ente_core::urls::PRODUCTION_API_ORIGIN;use serde::{Deserialize, Serialize};-use zeroize::Zeroize;+use zeroize::ZeroizeOnDrop;pub const DEFAULT_API_ORIGIN: &str = PRODUCTION_API_ORIGIN;@@ -60,8 +60,7 @@ impl AccountsClientConfig {}}-#[derive(Serialize, Deserialize, Zeroize)]-#[zeroize(drop)]+#[derive(Serialize, Deserialize, ZeroizeOnDrop)]pub struct AccountSecrets {pub token: Vec<u8>,pub master_key: Vec<u8>,diff --git a/rust/crates/core/src/crypto/types.rs b/rust/crates/core/src/crypto/types.rsindex 8f0137ba76..0285cc318b 100644--- a/rust/crates/core/src/crypto/types.rs+++ b/rust/crates/core/src/crypto/types.rs@@ -1,9 +1,9 @@use subtle::ConstantTimeEq;-use zeroize::{Zeroize, ZeroizeOnDrop};+use zeroize::ZeroizeOnDrop;use crate::crypto::{Error, Result, SecretVec};-#[derive(Clone, Zeroize, ZeroizeOnDrop)]+#[derive(ZeroizeOnDrop)]pub struct Key([u8; Self::BYTES]);impl Key {@@ -163,7 +163,7 @@ impl PublicKey {}}-#[derive(Clone, Zeroize, ZeroizeOnDrop)]+#[derive(ZeroizeOnDrop)]pub struct SecretKey([u8; Self::BYTES]);impl SecretKey {@@ -259,13 +259,6 @@ mod tests {assert!(!debug.contains("42"));}- #[test]- fn test_key_zeroize() {- let mut key = Key::from_bytes([0xABu8; 32]);- key.zeroize();- assert_eq!(key.as_bytes(), &[0u8; 32]);- }-#[test]fn test_nonce_salt_generate() {assert_ne!(Nonce::generate(), Nonce::generate());diff --git a/rust/crates/space/src/client/tests.rs b/rust/crates/space/src/client/tests.rsindex 1c703de132..35a0447b7f 100644--- a/rust/crates/space/src/client/tests.rs+++ b/rust/crates/space/src/client/tests.rs@@ -7,22 +7,6 @@ use crate::transport::{use mockito::{Matcher, Server};use serde_json::json;-use zeroize::Zeroize;--#[test]-fn decrypted_friend_share_zeroizes_its_key() {- let mut share = DecryptedFriendShare {- friend: "[email protected]".to_owned(),- space_id: "space-friend".to_owned(),- space_slug: "friend".to_owned(),- space_key: vec![42; 32],- key_version: 1,- };-- share.zeroize();-- assert!(share.space_key.is_empty());-}#[tokio::test]async fn account_api_sends_space_session_token_header() {diff --git a/rust/crates/space/src/models.rs b/rust/crates/space/src/models.rsindex 55a1e9367e..90ceacfe17 100644--- a/rust/crates/space/src/models.rs+++ b/rust/crates/space/src/models.rs@@ -1,5 +1,5 @@use serde::{Deserialize, Serialize};-use zeroize::Zeroize;+use zeroize::ZeroizeOnDrop;use crate::transport::{PostObjectPayload, ProfileAvatarResponse, ProfileCoverResponse, SpaceActorResponse,@@ -93,8 +93,7 @@ pub struct DecryptedMessage {pub payload: MessagePayload,}-#[derive(Clone, Zeroize)]-#[zeroize(drop)]+#[derive(Clone, ZeroizeOnDrop)]pub struct DecryptedFriendShare {pub friend: String,pub space_id: String,