π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Avoid redundant sensitive key derivations
Manav Rathieccad3bbfd58
diff --git a/rust/crates/accounts/src/flow.rs b/rust/crates/accounts/src/flow.rsindex 3171c74bab..6443e1e20b 100644--- a/rust/crates/accounts/src/flow.rs+++ b/rust/crates/accounts/src/flow.rs@@ -11,7 +11,7 @@ use ente_core::{auth::{self, DecryptedSecrets, GeneratedSrpSetup, KeyAttributes as CoreKeyAttributes,KeyDerivationStrength, derive_kek, generate_keys_with_strength, generate_srp_setup,- get_recovery_key,+ generate_srp_setup_with_login_key, get_recovery_key,},crypto::{self, SecretVec, secretbox},};@@ -411,24 +411,18 @@ where&self,params: ChangePasswordParams,) -> Result<ChangePasswordResult> {- let (updated_key_attributes_core, _) = auth::generate_key_attributes_for_new_password(- ¶ms.master_key,- &to_core_key_attributes(¶ms.key_attributes),- ¶ms.password,- )?;+ let (updated_key_attributes_core, login_key) =+ auth::generate_key_attributes_for_new_password(+ ¶ms.master_key,+ &to_core_key_attributes(¶ms.key_attributes),+ ¶ms.password,+ )?;let updated_key_attributes = to_api_key_attributes(&updated_key_attributes_core);let updated_key_attr = UpdatedKeyAttr::from(&updated_key_attributes);- let kek = derive_kek(- ¶ms.password,- &updated_key_attributes.kek_salt,- updated_key_attributes.mem_limit as u32,- updated_key_attributes.ops_limit as u32,- )?;-let srp_user_id = Uuid::new_v4();- let srp_setup = generate_srp_setup(&kek, &srp_user_id.to_string())?;+ let srp_setup = generate_srp_setup_with_login_key(&login_key, &srp_user_id.to_string())?;let update = self.complete_srp_update(&srp_user_id,diff --git a/rust/crates/core/src/auth/api.rs b/rust/crates/core/src/auth/api.rsindex ef1b1bebce..ab02ff27bf 100644--- a/rust/crates/core/src/auth/api.rs+++ b/rust/crates/core/src/auth/api.rs@@ -464,8 +464,7 @@ mod tests {#[cfg(feature = "srp")]#[test]fn test_generate_srp_setup() {- let generated = generate_sensitive_kek("test_password").unwrap();- let srp_setup = generate_srp_setup(&generated.key, "test-user-id").unwrap();+ let srp_setup = generate_srp_setup(&[1; 32], "test-user-id").unwrap();assert_eq!(srp_setup.srp_salt.len(), 16);assert_eq!(srp_setup.login_sub_key.len(), 16);