Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Align Rust crypto dependencies with HPKE

Manav Rathi2c62623f1068
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index 2c9aab6c18..3d29ca07d5 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -1671,12 +1671,12 @@ dependencies = [
[[package]]
name = "curve25519-dalek"
-version = "4.1.3"
+version = "5.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
+checksum = "b5eed333089e2e1c1ac8c6c0398e5e2497b4c9926ca6d0365ed1e099afa5bc23"
dependencies = [
"cfg-if",
- "cpufeatures 0.2.17",
+ "cpufeatures 0.3.0",
"curve25519-dalek-derive",
"fiat-crypto",
"rustc_version",
@@ -1706,7 +1706,7 @@ dependencies = [
"cxxbridge-cmd",
"cxxbridge-flags",
"cxxbridge-macro",
- "foldhash 0.2.0",
+ "foldhash",
"link-cplusplus",
]
@@ -2129,7 +2129,7 @@ checksum = "521e380c0c8afb8d9a1e83a1822ee03556fc3e3e7dbc1fd30be14e37f9cb3f89"
dependencies = [
"bit-set",
"cssparser",
- "foldhash 0.2.0",
+ "foldhash",
"html5ever",
"precomputed-hash",
"selectors",
@@ -2337,11 +2337,10 @@ dependencies = [
"bip39",
"ente-core",
"ente-test-support",
- "getrandom 0.2.17",
+ "getrandom 0.4.3",
"hex",
"hmac 0.13.0",
"mockito",
- "rand_core 0.6.4",
"serde",
"serde_json",
"sha1 0.11.0",
@@ -2432,7 +2431,7 @@ dependencies = [
"crypto_secretbox",
"crypto_secretstream",
"futures-core",
- "getrandom 0.2.17",
+ "getrandom 0.4.3",
"gloo-timers",
"log",
"md-5 0.11.0",
@@ -2981,9 +2980,9 @@ dependencies = [
[[package]]
name = "fiat-crypto"
-version = "0.2.9"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
+checksum = "64cd1e32ddd350061ae6edb1b082d7c54915b5c672c389143b9a63403a109f24"
[[package]]
name = "field-offset"
@@ -3135,12 +3134,6 @@ version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-[[package]]
-name = "foldhash"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
-
[[package]]
name = "foldhash"
version = "0.2.0"
@@ -3473,16 +3466,16 @@ dependencies = [
[[package]]
name = "getrandom"
-version = "0.4.2"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555"
+checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099"
dependencies = [
"cfg-if",
+ "js-sys",
"libc",
"r-efi 6.0.0",
"rand_core 0.10.1",
- "wasip2",
- "wasip3",
+ "wasm-bindgen",
]
[[package]]
@@ -3714,15 +3707,6 @@ version = "0.14.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-[[package]]
-name = "hashbrown"
-version = "0.15.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
-dependencies = [
- "foldhash 0.1.5",
-]
-
[[package]]
name = "hashbrown"
version = "0.16.1"
@@ -3731,7 +3715,7 @@ checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
dependencies = [
"allocator-api2",
"equivalent",
- "foldhash 0.2.0",
+ "foldhash",
]
[[package]]
@@ -4500,12 +4484,6 @@ version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1adcf7b613a268af025bc2a2532b4b9ee294e6051c5c0832d8bff20ac0232e68"
-[[package]]
-name = "id-arena"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
-
[[package]]
name = "ident_case"
version = "1.0.1"
@@ -5197,12 +5175,6 @@ version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-[[package]]
-name = "leb128fmt"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
-
[[package]]
name = "lebe"
version = "0.5.3"
@@ -7035,7 +7007,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207"
dependencies = [
"chacha20 0.10.0",
- "getrandom 0.4.2",
+ "getrandom 0.4.3",
"rand_core 0.10.1",
]
@@ -9148,7 +9120,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd"
dependencies = [
"fastrand",
- "getrandom 0.4.2",
+ "getrandom 0.3.4",
"once_cell",
"rustix",
"windows-sys 0.61.2",
@@ -9791,12 +9763,6 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
-[[package]]
-name = "unicode-xid"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
-
[[package]]
name = "uniffi"
version = "0.31.0"
@@ -10058,7 +10024,7 @@ version = "1.23.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ddd74a9687298c6858e9b88ec8935ec45d22e8fd5e6394fa1bd4e99a87789c76"
dependencies = [
- "getrandom 0.4.2",
+ "getrandom 0.4.3",
"js-sys",
"serde_core",
"uuid-rng-internal",
@@ -10071,7 +10037,7 @@ version = "1.23.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1409d2323564d9b8d01192a77a0604a46bf29eb42e9b535aca34dec65482652b"
dependencies = [
- "getrandom 0.4.2",
+ "getrandom 0.4.3",
]
[[package]]
@@ -10163,15 +10129,6 @@ dependencies = [
"wit-bindgen",
]
-[[package]]
-name = "wasip3"
-version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
-dependencies = [
- "wit-bindgen",
-]
-
[[package]]
name = "wasm-bindgen"
version = "0.2.125"
@@ -10227,28 +10184,6 @@ dependencies = [
"unicode-ident",
]
-[[package]]
-name = "wasm-encoder"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319"
-dependencies = [
- "leb128fmt",
- "wasmparser",
-]
-
-[[package]]
-name = "wasm-metadata"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
-dependencies = [
- "anyhow",
- "indexmap 2.14.0",
- "wasm-encoder",
- "wasmparser",
-]
-
[[package]]
name = "wasm-streams"
version = "0.4.2"
@@ -10275,18 +10210,6 @@ dependencies = [
"web-sys",
]
-[[package]]
-name = "wasmparser"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
-dependencies = [
- "bitflags 2.11.0",
- "hashbrown 0.15.5",
- "indexmap 2.14.0",
- "semver",
-]
-
[[package]]
name = "wasmtimer"
version = "0.4.3"
@@ -11002,88 +10925,6 @@ name = "wit-bindgen"
version = "0.51.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
-dependencies = [
- "wit-bindgen-rust-macro",
-]
-
-[[package]]
-name = "wit-bindgen-core"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc"
-dependencies = [
- "anyhow",
- "heck 0.5.0",
- "wit-parser",
-]
-
-[[package]]
-name = "wit-bindgen-rust"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
-dependencies = [
- "anyhow",
- "heck 0.5.0",
- "indexmap 2.14.0",
- "prettyplease",
- "syn 2.0.117",
- "wasm-metadata",
- "wit-bindgen-core",
- "wit-component",
-]
-
-[[package]]
-name = "wit-bindgen-rust-macro"
-version = "0.51.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
-dependencies = [
- "anyhow",
- "prettyplease",
- "proc-macro2",
- "quote",
- "syn 2.0.117",
- "wit-bindgen-core",
- "wit-bindgen-rust",
-]
-
-[[package]]
-name = "wit-component"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
-dependencies = [
- "anyhow",
- "bitflags 2.11.0",
- "indexmap 2.14.0",
- "log",
- "serde",
- "serde_derive",
- "serde_json",
- "wasm-encoder",
- "wasm-metadata",
- "wasmparser",
- "wit-parser",
-]
-
-[[package]]
-name = "wit-parser"
-version = "0.244.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
-dependencies = [
- "anyhow",
- "id-arena",
- "indexmap 2.14.0",
- "log",
- "semver",
- "serde",
- "serde_derive",
- "serde_json",
- "unicode-xid",
- "wasmparser",
-]
[[package]]
name = "write16"
@@ -11173,13 +11014,12 @@ dependencies = [
[[package]]
name = "x25519-dalek"
-version = "2.0.1"
+version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277"
+checksum = "e7e8131a03190127fb2263afc72b322ecadae46b6ff8c6f399ff5d02f5559af6"
dependencies = [
"curve25519-dalek",
- "rand_core 0.6.4",
- "serde",
+ "rand_core 0.10.1",
"zeroize",
]
diff --git a/rust/crates/accounts/Cargo.toml b/rust/crates/accounts/Cargo.toml
index 05eb8c8330..2849577726 100644
--- a/rust/crates/accounts/Cargo.toml
+++ b/rust/crates/accounts/Cargo.toml
@@ -8,7 +8,7 @@ museum = []
[dependencies]
bip39 = { version = "2", default-features = false, features = ["std"] }
ente-core.workspace = true
-getrandom = { version = "0.2", features = ["js"] }
+getrandom = { version = "0.4", features = ["wasm_js"] }
hex = "0.4"
serde.workspace = true
serde_json.workspace = true
@@ -24,6 +24,5 @@ zeroize.workspace = true
ente-test-support.workspace = true
hmac = "0.13"
mockito.workspace = true
-rand_core = { version = "0.6", features = ["getrandom"] }
sha1 = "0.11"
tokio = { version = "1", features = ["macros", "rt-multi-thread", "time"] }
diff --git a/rust/crates/accounts/src/auth/srp.rs b/rust/crates/accounts/src/auth/srp.rs
index 384403db35..ff4a72ba90 100644
--- a/rust/crates/accounts/src/auth/srp.rs
+++ b/rust/crates/accounts/src/auth/srp.rs
@@ -41,7 +41,7 @@ impl SrpSession {
let client = ClientG4096::<Sha256>::new();
let mut a_private = vec![0u8; 64];
- getrandom::getrandom(&mut a_private)
+ getrandom::fill(&mut a_private)
.map_err(|e| Error::Srp(format!("Failed to generate random bytes: {}", e)))?;
let a_public = client.compute_public_ephemeral(&a_private);
@@ -266,7 +266,6 @@ mod tests {
#[test]
fn test_sensitive_buffers_zeroized_after_compute_m1() {
- use rand_core::RngCore;
use srp::ServerG4096;
let srp_user_id = "test-user-id";
@@ -278,7 +277,7 @@ mod tests {
let server = ServerG4096::<Sha256>::new();
let mut b = [0u8; 64];
- rand_core::OsRng.fill_bytes(&mut b);
+ getrandom::fill(&mut b).unwrap();
let b_pub = server.compute_public_ephemeral(&b, &verifier);
let mut session = SrpSession::new(srp_user_id, &srp_salt, &login_key).unwrap();
@@ -290,7 +289,6 @@ mod tests {
#[test]
fn test_m1_and_k_zeroized_via_drop_impl() {
- use rand_core::RngCore;
use srp::ServerG4096;
use zeroize::Zeroize;
@@ -303,7 +301,7 @@ mod tests {
let server = ServerG4096::<Sha256>::new();
let mut b = [0u8; 64];
- rand_core::OsRng.fill_bytes(&mut b);
+ getrandom::fill(&mut b).unwrap();
let b_pub = server.compute_public_ephemeral(&b, &verifier);
let mut session = SrpSession::new(srp_user_id, &srp_salt, &login_key).unwrap();
diff --git a/rust/crates/core/Cargo.toml b/rust/crates/core/Cargo.toml
index a75fa9df7d..16fa10d9e6 100644
--- a/rust/crates/core/Cargo.toml
+++ b/rust/crates/core/Cargo.toml
@@ -10,20 +10,17 @@ 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`).
-# This also enables `rand_core::OsRng` on WASM.
-getrandom = { version = "0.2", features = ["js"] }
+getrandom = { version = "0.4", features = ["wasm_js"] }
log.workspace = true
md-5.workspace = true
-rand_core = { version = "0.6", features = ["getrandom"] }
+rand_core_06 = { package = "rand_core", version = "0.6" }
reqwest = { workspace = true, features = ["http2", "charset", "system-proxy", "json", "rustls-tls-native-roots", "rustls-tls-webpki-roots"] }
salsa20 = "0.10"
serde.workspace = true
serde_json.workspace = true
subtle = "2"
thiserror.workspace = true
-x25519-dalek = { version = "2.0", features = ["static_secrets"] }
+x25519-dalek = { version = "3.0", features = ["static_secrets"] }
zeroize.workspace = true
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
diff --git a/rust/crates/core/src/crypto/mod.rs b/rust/crates/core/src/crypto/mod.rs
index bfd9698944..948f648e32 100644
--- a/rust/crates/core/src/crypto/mod.rs
+++ b/rust/crates/core/src/crypto/mod.rs
@@ -12,4 +12,5 @@ pub mod stream;
pub use error::{Error, Result};
pub use secret::{SecretString, SecretVec};
+pub(crate) use types::fill_random;
pub use types::{Header, Key, Nonce, PublicKey, Salt, SecretKey, random_bytes};
diff --git a/rust/crates/core/src/crypto/sealed.rs b/rust/crates/core/src/crypto/sealed.rs
index f4a40b093b..65812b5614 100644
--- a/rust/crates/core/src/crypto/sealed.rs
+++ b/rust/crates/core/src/crypto/sealed.rs
@@ -2,13 +2,12 @@ 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 zeroize::Zeroize;
-use crate::crypto::{Error, PublicKey, Result, SecretKey};
+use crate::crypto::{Error, PublicKey, Result, SecretKey, fill_random};
pub const PUBLIC_KEY_BYTES: usize = PublicKey::BYTES;
@@ -51,7 +50,7 @@ pub fn seal(plaintext: &[u8], recipient_pk: &PublicKey) -> Result<Vec<u8>> {
let recipient_pk_point = x25519_dalek::PublicKey::from(recipient_pk_arr);
let mut ephemeral_secret_bytes = [0u8; 32];
- OsRng.fill_bytes(&mut ephemeral_secret_bytes);
+ fill_random(&mut ephemeral_secret_bytes);
let ephemeral_secret = StaticSecret::from(ephemeral_secret_bytes);
let ephemeral_public = x25519_dalek::PublicKey::from(&ephemeral_secret);
diff --git a/rust/crates/core/src/crypto/stream.rs b/rust/crates/core/src/crypto/stream.rs
index fb4b8d6e87..80570c65f6 100644
--- a/rust/crates/core/src/crypto/stream.rs
+++ b/rust/crates/core/src/crypto/stream.rs
@@ -5,7 +5,7 @@
use crypto_secretstream::{
Header as UpstreamHeader, Key as UpstreamKey, PullStream, PushStream, Stream, Tag,
};
-use rand_core::OsRng;
+use rand_core_06::OsRng;
use std::io::{Read, Write};
use crate::crypto::{Error, Header, Key, Result};
diff --git a/rust/crates/core/src/crypto/types.rs b/rust/crates/core/src/crypto/types.rs
index 54f11a32c1..8f0137ba76 100644
--- a/rust/crates/core/src/crypto/types.rs
+++ b/rust/crates/core/src/crypto/types.rs
@@ -1,4 +1,3 @@
-use rand_core::{OsRng, RngCore};
use subtle::ConstantTimeEq;
use zeroize::{Zeroize, ZeroizeOnDrop};
@@ -12,7 +11,7 @@ impl Key {
pub fn generate() -> Self {
let mut bytes = [0u8; Self::BYTES];
- OsRng.fill_bytes(&mut bytes);
+ fill_random(&mut bytes);
Self(bytes)
}
@@ -64,7 +63,7 @@ impl Nonce {
pub fn generate() -> Self {
let mut bytes = [0u8; Self::BYTES];
- OsRng.fill_bytes(&mut bytes);
+ fill_random(&mut bytes);
Self(bytes)
}
@@ -94,7 +93,7 @@ impl Salt {
pub fn generate() -> Self {
let mut bytes = [0u8; Self::BYTES];
- OsRng.fill_bytes(&mut bytes);
+ fill_random(&mut bytes);
Self(bytes)
}
@@ -172,7 +171,7 @@ impl SecretKey {
pub fn generate() -> Self {
let mut bytes = [0u8; Self::BYTES];
- OsRng.fill_bytes(&mut bytes);
+ fill_random(&mut bytes);
Self(bytes)
}
@@ -216,10 +215,14 @@ impl Eq for SecretKey {}
pub fn random_bytes(len: usize) -> Vec<u8> {
let mut buf = vec![0u8; len];
- OsRng.fill_bytes(&mut buf);
+ fill_random(&mut buf);
buf
}
+pub(crate) fn fill_random(buf: &mut [u8]) {
+ getrandom::fill(buf).expect("failed to generate random bytes");
+}
+
#[cfg(test)]
mod tests {
use super::*;