π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Replace xsalsa20poly1305 with crypto_secretbox
Manav Rathi3999a5eeab67
diff --git a/rust/Cargo.lock b/rust/Cargo.lockindex 049145b737..2c9aab6c18 100644--- a/rust/Cargo.lock+++ b/rust/Cargo.lock@@ -1586,6 +1586,21 @@ dependencies = ["hybrid-array",]+[[package]]+name = "crypto_secretbox"+version = "0.1.1"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "b9d6cf87adf719ddf43a805e92c6870a531aedda35ff640442cbaf8674e141e1"+dependencies = [+ "aead",+ "cipher",+ "generic-array",+ "poly1305",+ "salsa20",+ "subtle",+ "zeroize",+]+[[package]]name = "crypto_secretstream"version = "0.2.0"@@ -2414,6 +2429,7 @@ dependencies = ["base64 0.22.1","blake2b_simd","bytes",+ "crypto_secretbox","crypto_secretstream","futures-core","getrandom 0.2.17",@@ -2430,7 +2446,6 @@ dependencies = ["thiserror 2.0.18","tokio","x25519-dalek",- "xsalsa20poly1305","zeroize",]@@ -3426,6 +3441,7 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"dependencies = ["typenum","version_check",+ "zeroize",][[package]]@@ -11187,19 +11203,6 @@ dependencies = ["windows-sys 0.59.0",]-[[package]]-name = "xsalsa20poly1305"-version = "0.9.1"-source = "registry+https://github.com/rust-lang/crates.io-index"-checksum = "02a6dad357567f81cd78ee75f7c61f1b30bb2fe4390be8fb7c69e2ac8dffb6c7"-dependencies = [- "aead",- "poly1305",- "salsa20",- "subtle",- "zeroize",-]-[[package]]name = "xz2"version = "0.1.7"diff --git a/rust/crates/core/Cargo.toml b/rust/crates/core/Cargo.tomlindex bafdefe103..a75fa9df7d 100644--- a/rust/crates/core/Cargo.toml+++ b/rust/crates/core/Cargo.toml@@ -8,6 +8,7 @@ edition = "2024"argon2 = "0.5"base64 = "0.22"blake2b_simd = "1.0"+crypto_secretbox = { version = "0.1", default-features = false, features = ["alloc", "salsa20"] }crypto_secretstream = "=0.2.0"# We enable `getrandom`'s `js` feature so that the crate works on# `wasm32-unknown-unknown` (it uses the browser's `crypto.getRandomValues`).@@ -23,7 +24,6 @@ serde_json.workspace = truesubtle = "2"thiserror.workspace = truex25519-dalek = { version = "2.0", features = ["static_secrets"] }-xsalsa20poly1305 = "0.9"zeroize.workspace = true[target.'cfg(not(target_arch = "wasm32"))'.dependencies]diff --git a/rust/crates/core/src/crypto/sealed.rs b/rust/crates/core/src/crypto/sealed.rsindex 491457aa71..f4a40b093b 100644--- a/rust/crates/core/src/crypto/sealed.rs+++ b/rust/crates/core/src/crypto/sealed.rs@@ -1,11 +1,11 @@use blake2b_simd::Params as Blake2bParams;+use crypto_secretbox::XSalsa20Poly1305;+use crypto_secretbox::aead::generic_array::GenericArray;+use crypto_secretbox::aead::{Aead, KeyInit};use rand_core::{OsRng, RngCore};use salsa20::hsalsa;use subtle::ConstantTimeEq;use x25519_dalek::StaticSecret;-use xsalsa20poly1305::XSalsa20Poly1305;-use xsalsa20poly1305::aead::generic_array::GenericArray;-use xsalsa20poly1305::aead::{Aead, KeyInit};use zeroize::Zeroize;use crate::crypto::{Error, PublicKey, Result, SecretKey};diff --git a/rust/crates/core/src/crypto/secretbox.rs b/rust/crates/core/src/crypto/secretbox.rsindex 28fb04158e..e1521c493d 100644--- a/rust/crates/core/src/crypto/secretbox.rs+++ b/rust/crates/core/src/crypto/secretbox.rs@@ -1,6 +1,6 @@-use xsalsa20poly1305::XSalsa20Poly1305;-use xsalsa20poly1305::aead::generic_array::GenericArray;-use xsalsa20poly1305::aead::{Aead, KeyInit};+use crypto_secretbox::XSalsa20Poly1305;+use crypto_secretbox::aead::generic_array::GenericArray;+use crypto_secretbox::aead::{Aead, KeyInit};use crate::crypto::{Error, Key, Nonce, Result};@@ -113,6 +113,29 @@ mod tests {assert_eq!(decrypted, plaintext);}+ #[test]+ fn test_nacl_vector() {+ // NaCl's tests/secretbox.c vector.+ let key = Key::try_from_slice(+ &crate::b64::decode("GydVZHPphdRizVEZeppGx2AJVJ6sZHTyBsTuCET2g4k=").unwrap(),+ )+ .unwrap();+ let nonce =+ Nonce::try_from_slice(&crate::b64::decode("aWlu6VW2K3PNYr2odfxz1oIZ4ANregs3").unwrap())+ .unwrap();+ let plaintext = crate::b64::decode(+ "vgdfxTyB8tXPFBMW6+sMe1IoxSpMYsvUS2aEm2QkT/zl7LqvM711GhrHKNRebGEpbNw8ASM1YfQdtmzOMUrbMQ476CUMRvBtzuo6f6E0gFfi9lVq1rExigJKg48hrx/eBIl360j1n/1JJMocYJAuUvCgibx2iXBA4IL5N3Y4SGReBwU=",+ )+ .unwrap();+ let ciphertext = crate::b64::decode(+ "8//HcD+UAOUqfftLPTMF2Y6ZO59IaBJzwpZQujL8ds5IMy6nFk2WpEdvuMUxoRhqwN/BfJjc6HtNp/AR7EjJcnHSwg+bko/iJw1vuGPVFzi0ju7jFKfMirkyFkVI5SaukCJDaFF6z+q9a7NzK8Dp2pmDK2HKAbbeViRKnojV+bN5c/YipD0UplmbH2VMtFp041Wl",+ )+ .unwrap();++ assert_eq!(encrypt_with_nonce(&plaintext, &nonce, &key), ciphertext);+ assert_eq!(decrypt(&ciphertext, &nonce, &key).unwrap(), plaintext);+ }+#[test]fn test_different_nonces_produce_different_ciphertexts() {let key = Key::generate();