From bf469c3c1d58ed70ea7b5db5467214ca8a6b55af Mon Sep 17 00:00:00 2001 From: Mathieu Morrissette Date: Thu, 13 Mar 2025 14:37:35 -0400 Subject: [PATCH] chore(deps): remove rand_core dependency --- Cargo.lock | 129 ++++++++---------- Cargo.toml | 2 +- src/ciphertext/ciphertext_v2.rs | 2 +- src/key/key_v1.rs | 2 +- src/online_ciphertext/online_ciphertext_v1.rs | 2 +- src/secret_sharing/secret_sharing_v1.rs | 2 +- src/signing_key/signing_key_v1.rs | 2 +- 7 files changed, 60 insertions(+), 81 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 671eef84..b54fe4c4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -132,7 +132,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -176,9 +176,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64ct" -version = "1.6.0" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" +checksum = "8faa168b8c4ffca39c2699e772943af41ec2b75fb1683dda07b28a6d285c53dc" [[package]] name = "basic-toml" @@ -369,9 +369,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.31" +version = "4.5.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "027bb0d98429ae334a8698531da7077bdf906419543a35a55c2cb1b66437d767" +checksum = "6088f3ae8c3608d19260cd7445411865a485688711b78b5be70d78cd96136f83" dependencies = [ "clap_builder", "clap_derive", @@ -379,9 +379,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.31" +version = "4.5.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5589e0cba072e0f3d23791efac0fd8627b49c829c196a492e88168e6a669d863" +checksum = "22a7ef7f676155edfb82daa97f99441f3ebf4a58d5e32f295a56259f1b6facc8" dependencies = [ "anstream", "anstyle", @@ -391,14 +391,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.28" +version = "4.5.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed" +checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -469,7 +469,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -516,8 +516,8 @@ dependencies = [ "num_enum", "paste", "pbkdf2", + "rand 0.8.5", "rand 0.9.0", - "rand_core 0.6.4", "rust-argon2", "scrypt", "serde-wasm-bindgen", @@ -729,9 +729,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.7.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652" +checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058" dependencies = [ "equivalent", "hashbrown", @@ -777,9 +777,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.170" +version = "0.2.171" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828" +checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6" [[package]] name = "libfuzzer-sys" @@ -872,14 +872,14 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] name = "once_cell" -version = "1.20.3" +version = "1.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" +checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc" [[package]] name = "opaque-debug" @@ -938,11 +938,11 @@ checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e" [[package]] name = "ppv-lite86" -version = "0.2.20" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" dependencies = [ - "zerocopy 0.7.35", + "zerocopy", ] [[package]] @@ -1011,7 +1011,7 @@ dependencies = [ "proc-macro2", "pyo3-macros-backend", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -1024,7 +1024,7 @@ dependencies = [ "proc-macro2", "pyo3-build-config", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -1038,9 +1038,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1f1914ce909e1658d9907913b4b91947430c7d9be598b15a1912935b8c04801" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" dependencies = [ "proc-macro2", ] @@ -1064,7 +1064,7 @@ checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94" dependencies = [ "rand_chacha 0.9.0", "rand_core 0.9.3", - "zerocopy 0.8.22", + "zerocopy", ] [[package]] @@ -1172,7 +1172,7 @@ checksum = "7f81c2fde025af7e69b1d1420531c8a8811ca898919db177141a85313b1cb932" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -1197,9 +1197,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.218" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" dependencies = [ "serde_derive", ] @@ -1217,13 +1217,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.218" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -1317,7 +1317,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -1339,9 +1339,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.99" +version = "2.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e02e925281e18ffd9d640e234264753c43edc62d64b2d4cf898f1bc5e75f3fc2" +checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0" dependencies = [ "proc-macro2", "quote", @@ -1389,7 +1389,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -1400,7 +1400,7 @@ checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -1446,7 +1446,7 @@ checksum = "560b82d656506509d43abe30e0ba64c56b1953ab3d4fe7ba5902747a7a3cedd5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -1495,7 +1495,7 @@ name = "uniffi-builder-macro" version = "0.1.0" dependencies = [ "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -1539,7 +1539,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "802d2051a700e3ec894c79f80d2705b69d85844dafbbe5d1a92776f8f48b563a" dependencies = [ "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -1569,7 +1569,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.99", + "syn 2.0.100", "toml", "uniffi_meta", ] @@ -1687,7 +1687,7 @@ dependencies = [ "log", "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", "wasm-bindgen-shared", ] @@ -1722,7 +1722,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -1757,7 +1757,7 @@ checksum = "17d5042cc5fa009658f9a7333ef24291b1291a25b6382dd68862a7f3b969f69b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -1863,9 +1863,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7f4ea97f6f78012141bcdb6a216b2609f0979ada50b20ca5b52dde2eac2bb1" +checksum = "0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36" dependencies = [ "memchr", ] @@ -1893,43 +1893,22 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" -dependencies = [ - "byteorder", - "zerocopy-derive 0.7.35", -] - -[[package]] -name = "zerocopy" -version = "0.8.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09612fda0b63f7cb9e0af7e5916fe5a1f8cdcb066829f10f36883207628a4872" -dependencies = [ - "zerocopy-derive 0.8.22", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.35" +version = "0.8.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +checksum = "fd97444d05a4328b90e75e503a34bad781f14e28a823ad3557f0750df1ebcbc6" dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.99", + "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.22" +version = "0.8.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79f81d38d7a2ed52d8f034e62c568e111df9bf8aba2f7cf19ddc5bf7bd89d520" +checksum = "6352c01d0edd5db859a63e2605f4ea3183ddbd15e2c4a9e7d32184df75e4f154" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] [[package]] @@ -1949,5 +1928,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.99", + "syn 2.0.100", ] diff --git a/Cargo.toml b/Cargo.toml index c1d66c2c..8a3dff9d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,7 +47,7 @@ strum = { version = "0.27", features = ["derive"] } subtle = "2" zeroize = { version = "1.8" } rand = "0.9" -rand_core_06 = { package = "rand_core", version = "0.6" } +rand_08 = { package = "rand", version = "0.8" } thiserror = "2.0.12" typed-builder = "0.20.0" rust-argon2 = { version = "2.1", default-features = false } diff --git a/src/ciphertext/ciphertext_v2.rs b/src/ciphertext/ciphertext_v2.rs index f1186f97..aae1f278 100644 --- a/src/ciphertext/ciphertext_v2.rs +++ b/src/ciphertext/ciphertext_v2.rs @@ -186,7 +186,7 @@ impl CiphertextV2Asymmetric { ) -> Result { let public_key = x25519_dalek::PublicKey::from(public_key); - let ephemeral_private_key = StaticSecret::random_from_rng(rand_core_06::OsRng); + let ephemeral_private_key = StaticSecret::random_from_rng(rand_08::rngs::OsRng); let ephemeral_public_key = x25519_dalek::PublicKey::from(&ephemeral_private_key); let key = ephemeral_private_key.diffie_hellman(&public_key); diff --git a/src/key/key_v1.rs b/src/key/key_v1.rs index 3158443c..822626b2 100644 --- a/src/key/key_v1.rs +++ b/src/key/key_v1.rs @@ -96,7 +96,7 @@ impl TryFrom<&[u8]> for KeyV1Public { } pub fn generate_keypair() -> KeyV1Pair { - let private = StaticSecret::random_from_rng(rand_core_06::OsRng); + let private = StaticSecret::random_from_rng(rand_08::rngs::OsRng); let public = PublicKey::from(&private); KeyV1Pair { diff --git a/src/online_ciphertext/online_ciphertext_v1.rs b/src/online_ciphertext/online_ciphertext_v1.rs index a405526a..b61fac5a 100644 --- a/src/online_ciphertext/online_ciphertext_v1.rs +++ b/src/online_ciphertext/online_ciphertext_v1.rs @@ -318,7 +318,7 @@ impl OnlineCiphertextV1Encryptor { // Perform a ECDH exchange as per ECIES let public_key = x25519_dalek::PublicKey::from(public_key); - let ephemeral_private_key = StaticSecret::random_from_rng(rand_core_06::OsRng); + let ephemeral_private_key = StaticSecret::random_from_rng(rand_08::rngs::OsRng); let ephemeral_public_key = x25519_dalek::PublicKey::from(&ephemeral_private_key); let key = ephemeral_private_key.diffie_hellman(&public_key); diff --git a/src/secret_sharing/secret_sharing_v1.rs b/src/secret_sharing/secret_sharing_v1.rs index 5726a1ec..0092b335 100644 --- a/src/secret_sharing/secret_sharing_v1.rs +++ b/src/secret_sharing/secret_sharing_v1.rs @@ -66,7 +66,7 @@ impl ShareV1 { let secret = Zeroizing::new(crate::utils::generate_key(length)?); let sharks = Sharks(threshold); - let dealer = sharks.dealer_rng(&secret, &mut rand_core_06::OsRng); + let dealer = sharks.dealer_rng(&secret, &mut rand_08::rngs::OsRng); Ok(dealer.take(n_shares as usize).map(move |s| ShareV1 { threshold, diff --git a/src/signing_key/signing_key_v1.rs b/src/signing_key/signing_key_v1.rs index 8bfdc8ae..21fdec7d 100644 --- a/src/signing_key/signing_key_v1.rs +++ b/src/signing_key/signing_key_v1.rs @@ -99,7 +99,7 @@ impl TryFrom<&[u8]> for SigningKeyV1Public { } pub fn generate_signing_keypair() -> SigningKeyV1Pair { - let mut csprng = rand_core_06::OsRng; + let mut csprng = rand_08::rngs::OsRng; let keypair = SigningKey::generate(&mut csprng);