From 7959ddefd7ee28690a55c32ba698dfbac1eb06e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 10 Feb 2026 00:06:32 +0000 Subject: [PATCH 1/2] Bump rand from 0.9.2 to 0.10.0 Bumps [rand](https://github.com/rust-random/rand) from 0.9.2 to 0.10.0. - [Release notes](https://github.com/rust-random/rand/releases) - [Changelog](https://github.com/rust-random/rand/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-random/rand/compare/rand_core-0.9.2...0.10.0) --- updated-dependencies: - dependency-name: rand dependency-version: 0.10.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 257 +++++++++++++++++++++++++++++++++++++++++++++++++---- Cargo.toml | 2 +- 2 files changed, 239 insertions(+), 20 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a72c22528..b9b72a2c6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -36,7 +36,7 @@ checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ "cfg-if", "cipher", - "cpufeatures", + "cpufeatures 0.2.12", ] [[package]] @@ -789,7 +789,18 @@ checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818" dependencies = [ "cfg-if", "cipher", - "cpufeatures", + "cpufeatures 0.2.12", +] + +[[package]] +name = "chacha20" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.0", + "rand_core 0.10.0", ] [[package]] @@ -799,7 +810,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" dependencies = [ "aead", - "chacha20", + "chacha20 0.9.1", "cipher", "poly1305", "zeroize", @@ -1016,6 +1027,15 @@ dependencies = [ "libc", ] +[[package]] +name = "cpufeatures" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b2a41393f66f16b0823bb79094d54ac5fbd34ab292ddafb9a0456ac9f87d201" +dependencies = [ + "libc", +] + [[package]] name = "crc" version = "3.0.1" @@ -1128,7 +1148,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.12", "curve25519-dalek-derive", "fiat-crypto 0.2.9", "rustc_version", @@ -1881,6 +1901,20 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "getrandom" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "139ef39800118c7683f2fd3c98c1b23c09ae076556b435f8e9064ae108aaeeec" +dependencies = [ + "cfg-if", + "libc", + "r-efi", + "rand_core 0.10.0", + "wasip2", + "wasip3", +] + [[package]] name = "ghash" version = "0.5.1" @@ -2439,6 +2473,12 @@ dependencies = [ "syn", ] +[[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" @@ -2599,7 +2639,7 @@ dependencies = [ "querystring", "quickcheck", "quickcheck_macros", - "rand 0.9.2", + "rand 0.10.0", "rayon", "regex", "reqwest", @@ -2660,7 +2700,7 @@ dependencies = [ "janus_messages 0.9.0-prerelease-1", "opentelemetry", "querystring", - "rand 0.9.2", + "rand 0.10.0", "rstest", "serde", "serde_json", @@ -2706,7 +2746,7 @@ dependencies = [ "postgres-protocol", "postgres-types", "prio 0.18.1-alpha.2", - "rand 0.9.2", + "rand 0.10.0", "regex", "reqwest", "rstest", @@ -2746,7 +2786,7 @@ dependencies = [ "mockito", "ohttp", "prio 0.18.1-alpha.2", - "rand 0.9.2", + "rand 0.10.0", "reqwest", "thiserror 2.0.18", "tokio", @@ -2774,7 +2814,7 @@ dependencies = [ "mime", "mockito", "prio 0.18.1-alpha.2", - "rand 0.9.2", + "rand 0.10.0", "reqwest", "retry-after", "serde", @@ -2813,7 +2853,7 @@ dependencies = [ "mockito", "prio 0.18.1-alpha.2", "quickcheck", - "rand 0.9.2", + "rand 0.10.0", "regex", "reqwest", "retry-after", @@ -2865,7 +2905,7 @@ dependencies = [ "opentelemetry", "prio 0.18.1-alpha.2", "quickcheck", - "rand 0.9.2", + "rand 0.10.0", "regex", "reqwest", "rstest", @@ -2904,7 +2944,7 @@ dependencies = [ "janus_interop_binaries", "janus_messages 0.9.0-prerelease-1", "prio 0.18.1-alpha.2", - "rand 0.9.2", + "rand 0.10.0", "regex", "reqwest", "serde", @@ -2954,7 +2994,7 @@ dependencies = [ "num_enum", "pretty_assertions", "prio 0.18.1-alpha.2", - "rand 0.9.2", + "rand 0.10.0", "serde", "serde_test", "thiserror 2.0.18", @@ -2975,7 +3015,7 @@ dependencies = [ "janus_core", "janus_messages 0.9.0-prerelease-1", "prio 0.18.1-alpha.2", - "rand 0.9.2", + "rand 0.10.0", "reqwest", "serde_json", "serde_yaml", @@ -3084,7 +3124,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" dependencies = [ - "cpufeatures", + "cpufeatures 0.2.12", ] [[package]] @@ -3169,6 +3209,12 @@ dependencies = [ "spin 0.5.2", ] +[[package]] +name = "leb128fmt" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" + [[package]] name = "libc" version = "0.2.178" @@ -3924,7 +3970,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" dependencies = [ - "cpufeatures", + "cpufeatures 0.2.12", "opaque-debug", "universal-hash", ] @@ -3936,7 +3982,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.12", "opaque-debug", "universal-hash", ] @@ -4034,6 +4080,16 @@ dependencies = [ "yansi", ] +[[package]] +name = "prettyplease" +version = "0.2.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" +dependencies = [ + "proc-macro2", + "syn", +] + [[package]] name = "primeorder" version = "0.13.6" @@ -4264,6 +4320,17 @@ dependencies = [ "rand_core 0.9.0", ] +[[package]] +name = "rand" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc266eb313df6c5c09c1c7b1fbe2510961e5bcd3add930c1e31f7ed9da0feff8" +dependencies = [ + "chacha20 0.10.0", + "getrandom 0.4.1", + "rand_core 0.10.0", +] + [[package]] name = "rand_chacha" version = "0.3.1" @@ -4303,6 +4370,12 @@ dependencies = [ "zerocopy 0.8.14", ] +[[package]] +name = "rand_core" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba" + [[package]] name = "rand_distr" version = "0.5.1" @@ -4910,7 +4983,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.12", "digest", ] @@ -4921,7 +4994,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283" dependencies = [ "cfg-if", - "cpufeatures", + "cpufeatures 0.2.12", "digest", ] @@ -6399,6 +6472,12 @@ dependencies = [ "tinyvec", ] +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + [[package]] name = "universal-hash" version = "0.5.1" @@ -6578,6 +6657,24 @@ dependencies = [ "wit-bindgen-rt", ] +[[package]] +name = "wasip2" +version = "1.0.2+wasi-0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" +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 = "wasite" version = "0.1.0" @@ -6650,6 +6747,40 @@ 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.12.0", + "wasm-encoder", + "wasmparser", +] + +[[package]] +name = "wasmparser" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" +dependencies = [ + "bitflags 2.6.0", + "hashbrown 0.15.2", + "indexmap 2.12.0", + "semver", +] + [[package]] name = "web-sys" version = "0.3.85" @@ -6996,6 +7127,26 @@ dependencies = [ "memchr", ] +[[package]] +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", + "wit-parser", +] + [[package]] name = "wit-bindgen-rt" version = "0.39.0" @@ -7005,6 +7156,74 @@ dependencies = [ "bitflags 2.6.0", ] +[[package]] +name = "wit-bindgen-rust" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" +dependencies = [ + "anyhow", + "heck", + "indexmap 2.12.0", + "prettyplease", + "syn", + "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", + "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.6.0", + "indexmap 2.12.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.12.0", + "log", + "semver", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", + "wasmparser", +] + [[package]] name = "write16" version = "1.0.0" diff --git a/Cargo.toml b/Cargo.toml index 17966381c..7c90e7485 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -81,7 +81,7 @@ prometheus = "0.13.4" querystring = "1.1.0" quickcheck = { version = "1.0.3", default-features = false } quickcheck_macros = "1.1.0" -rand = "0.9" +rand = "0.10" rayon = "1.11.0" reqwest = { version = "0.12.28", default-features = false, features = ["rustls-tls-webpki-roots-no-provider"] } regex = "1.12.3" From 652184f945814d605e784184558dc14472855f45 Mon Sep 17 00:00:00 2001 From: "J.C. Jones" Date: Tue, 10 Feb 2026 09:14:04 -0700 Subject: [PATCH 2/2] Update everything but bad_client, which has deps on prio::vdaf::xof for randomness --- aggregator/src/aggregator.rs | 2 +- aggregator/src/aggregator/aggregation_job_creator.rs | 2 +- aggregator/src/aggregator/aggregation_job_writer.rs | 2 +- aggregator/src/aggregator/report_writer.rs | 2 +- aggregator/src/binaries/janus_cli.rs | 2 +- aggregator/src/binary_utils/job_driver.rs | 2 +- aggregator_api/src/tests.rs | 2 +- aggregator_core/src/datastore/models.rs | 2 +- aggregator_core/src/datastore/task_counters_tests.rs | 2 +- aggregator_core/src/datastore/test_util.rs | 2 +- aggregator_core/src/datastore/tests.rs | 2 +- aggregator_core/src/task.rs | 4 ++-- aggregator_core/src/taskprov.rs | 2 +- core/src/auth_tokens.rs | 2 +- integration_tests/tests/integration/common.rs | 2 +- interop_binaries/src/commands/janus_interop_collector.rs | 2 +- messages/src/lib.rs | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) diff --git a/aggregator/src/aggregator.rs b/aggregator/src/aggregator.rs index 5b444f1db..e72c605a9 100644 --- a/aggregator/src/aggregator.rs +++ b/aggregator/src/aggregator.rs @@ -82,7 +82,7 @@ use prio::{ flp::gadgets::{Mul, ParallelSum}, vdaf::prio3::{Prio3, Prio3Count, Prio3Histogram, Prio3Sum, Prio3SumVec}, }; -use rand::{Rng, random, rng}; +use rand::{RngExt, random, rng}; use reqwest::Client; use tokio::{select, try_join}; use tracing::{Level, debug, error, info, warn}; diff --git a/aggregator/src/aggregator/aggregation_job_creator.rs b/aggregator/src/aggregator/aggregation_job_creator.rs index 821d72f5c..348e117d9 100644 --- a/aggregator/src/aggregator/aggregation_job_creator.rs +++ b/aggregator/src/aggregator/aggregation_job_creator.rs @@ -51,7 +51,7 @@ use prio::{ prio3::{Prio3, Prio3Count, Prio3Histogram, Prio3Sum, Prio3SumVec}, }, }; -use rand::{Rng, random, rng}; +use rand::{RngExt, random, rng}; use tokio::{ time::{self, Instant, MissedTickBehavior, sleep_until}, try_join, diff --git a/aggregator/src/aggregator/aggregation_job_writer.rs b/aggregator/src/aggregator/aggregation_job_writer.rs index 7944f22c3..680b90507 100644 --- a/aggregator/src/aggregator/aggregation_job_writer.rs +++ b/aggregator/src/aggregator/aggregation_job_writer.rs @@ -30,7 +30,7 @@ use opentelemetry::{ KeyValue, metrics::{Counter, Histogram}, }; -use rand::{Rng as _, rng}; +use rand::{RngExt as _, rng}; use tokio::try_join; use tracing::{Level, warn}; diff --git a/aggregator/src/aggregator/report_writer.rs b/aggregator/src/aggregator/report_writer.rs index 953f48319..c1a052923 100644 --- a/aggregator/src/aggregator/report_writer.rs +++ b/aggregator/src/aggregator/report_writer.rs @@ -17,7 +17,7 @@ use janus_aggregator_core::{ }; use janus_core::{Runtime, time::Clock}; use janus_messages::TaskId; -use rand::{Rng, rng}; +use rand::{RngExt, rng}; use tokio::{ select, sync::{mpsc, oneshot}, diff --git a/aggregator/src/binaries/janus_cli.rs b/aggregator/src/binaries/janus_cli.rs index 13df03aeb..aa1b7687d 100644 --- a/aggregator/src/binaries/janus_cli.rs +++ b/aggregator/src/binaries/janus_cli.rs @@ -35,7 +35,7 @@ use k8s_openapi::api::core::v1::Secret; use kube::api::{ObjectMeta, PostParams}; use opentelemetry::global::meter; use prio::codec::Decode as _; -use rand::{Rng, distr::StandardUniform, rng}; +use rand::{RngExt, distr::StandardUniform, rng}; use serde::{Deserialize, Serialize}; use tokio::{ fs, diff --git a/aggregator/src/binary_utils/job_driver.rs b/aggregator/src/binary_utils/job_driver.rs index 8d45dfb21..0aea8a054 100644 --- a/aggregator/src/binary_utils/job_driver.rs +++ b/aggregator/src/binary_utils/job_driver.rs @@ -14,7 +14,7 @@ use janus_aggregator_core::{ }; use janus_core::{Runtime, time::Clock}; use opentelemetry::{KeyValue, metrics::Meter}; -use rand::{Rng, rng}; +use rand::{RngExt, rng}; use tokio::{ sync::{Semaphore, SemaphorePermit}, time::{self, Instant}, diff --git a/aggregator_api/src/tests.rs b/aggregator_api/src/tests.rs index 7b95eef28..8890bf4cf 100644 --- a/aggregator_api/src/tests.rs +++ b/aggregator_api/src/tests.rs @@ -29,7 +29,7 @@ use janus_messages::{ Duration, HpkeAeadId, HpkeConfig, HpkeConfigId, HpkeKdfId, HpkeKemId, HpkePublicKey, Role, TaskId, Time, taskprov::TimePrecision, }; -use rand::{Rng, distr::StandardUniform, random, rng}; +use rand::{RngExt, distr::StandardUniform, random, rng}; use serde_test::{Token, assert_ser_tokens, assert_tokens}; use trillium::{Handler, Status}; use trillium_testing::{ diff --git a/aggregator_core/src/datastore/models.rs b/aggregator_core/src/datastore/models.rs index 103a4c9c3..957de9480 100644 --- a/aggregator_core/src/datastore/models.rs +++ b/aggregator_core/src/datastore/models.rs @@ -35,7 +35,7 @@ use prio::{ topology::ping_pong::PingPongContinuation, vdaf::Aggregatable, }; -use rand::{distr::StandardUniform, prelude::Distribution}; +use rand::{RngExt, distr::StandardUniform, prelude::Distribution}; use serde::{Deserialize, Serialize}; use crate::{ diff --git a/aggregator_core/src/datastore/task_counters_tests.rs b/aggregator_core/src/datastore/task_counters_tests.rs index f00771677..72bdaf98e 100644 --- a/aggregator_core/src/datastore/task_counters_tests.rs +++ b/aggregator_core/src/datastore/task_counters_tests.rs @@ -1,5 +1,5 @@ use janus_core::{test_util::install_test_trace_subscriber, time::MockClock, vdaf::VdafInstance}; -use rand::{Rng, random, rng}; +use rand::{RngExt, random, rng}; use crate::{ datastore::{ diff --git a/aggregator_core/src/datastore/test_util.rs b/aggregator_core/src/datastore/test_util.rs index 9a89c1170..02b0166fc 100644 --- a/aggregator_core/src/datastore/test_util.rs +++ b/aggregator_core/src/datastore/test_util.rs @@ -15,7 +15,7 @@ use janus_core::{ test_util::testcontainers::Postgres, time::{Clock, MockClock}, }; -use rand::{Rng, distr::StandardUniform, random, rng}; +use rand::{RngExt, distr::StandardUniform, random, rng}; use sqlx::{ Connection, PgConnection, migrate::{Migrate, Migrator}, diff --git a/aggregator_core/src/datastore/tests.rs b/aggregator_core/src/datastore/tests.rs index 170bf0acd..04e707574 100644 --- a/aggregator_core/src/datastore/tests.rs +++ b/aggregator_core/src/datastore/tests.rs @@ -39,7 +39,7 @@ use prio::{ topology::ping_pong::PingPongMessage, vdaf::{dummy, prio3::Prio3Count}, }; -use rand::{Rng, distr::StandardUniform, random, rng}; +use rand::{RngExt, distr::StandardUniform, random, rng}; use tokio::{time::timeout, try_join}; use url::Url; diff --git a/aggregator_core/src/task.rs b/aggregator_core/src/task.rs index 47a1f51e3..5fabba7f5 100644 --- a/aggregator_core/src/task.rs +++ b/aggregator_core/src/task.rs @@ -15,7 +15,7 @@ use janus_messages::{ Time, batch_mode, taskprov::TimePrecision, }; use postgres_types::{FromSql, ToSql}; -use rand::{Rng, distr::StandardUniform, random, rng}; +use rand::{RngExt, distr::StandardUniform, random, rng}; use serde::{Deserialize, Deserializer, Serialize, Serializer, de::Error as _}; use url::Url; @@ -795,7 +795,7 @@ pub mod test_util { AggregateShareId, AggregationJobId, AggregationJobStep, CollectionJobId, Duration, HpkeConfigId, Role, TaskId, Time, taskprov::TimePrecision, }; - use rand::{Rng, distr::StandardUniform, random, rng}; + use rand::{RngExt, distr::StandardUniform, random, rng}; use url::Url; use crate::{ diff --git a/aggregator_core/src/taskprov.rs b/aggregator_core/src/taskprov.rs index 229f464ec..d6b93c423 100644 --- a/aggregator_core/src/taskprov.rs +++ b/aggregator_core/src/taskprov.rs @@ -9,7 +9,7 @@ use base64::{Engine, engine::general_purpose::URL_SAFE_NO_PAD}; use educe::Educe; use janus_core::{auth_tokens::AuthenticationToken, vdaf::VdafInstance}; use janus_messages::{Duration, HpkeConfig, Role, TaskId}; -use rand::{distr::StandardUniform, prelude::Distribution}; +use rand::{RngExt, distr::StandardUniform, prelude::Distribution}; use serde::{ Deserialize, Serialize, Serializer, de::{self, Visitor}, diff --git a/core/src/auth_tokens.rs b/core/src/auth_tokens.rs index 52c836516..08eb892e2 100644 --- a/core/src/auth_tokens.rs +++ b/core/src/auth_tokens.rs @@ -11,7 +11,7 @@ use aws_lc_rs::{ use base64::{Engine, engine::general_purpose::URL_SAFE_NO_PAD}; use educe::Educe; use http::{HeaderValue, header::AUTHORIZATION}; -use rand::{distr::StandardUniform, prelude::Distribution}; +use rand::{RngExt, distr::StandardUniform, prelude::Distribution}; use regex::Regex; use serde::{Deserialize, Deserializer, Serialize, Serializer, de::Error}; diff --git a/integration_tests/tests/integration/common.rs b/integration_tests/tests/integration/common.rs index 5d9344bb1..59aa89d97 100644 --- a/integration_tests/tests/integration/common.rs +++ b/integration_tests/tests/integration/common.rs @@ -23,7 +23,7 @@ use prio::{ flp::gadgets::ParallelSumMultithreaded, vdaf::{self, dummy, prio3::Prio3}, }; -use rand::{Rng, random, rng, seq::IteratorRandom as _}; +use rand::{RngExt, random, rng, seq::IteratorRandom as _}; use tokio::time::{self, sleep}; use url::Url; diff --git a/interop_binaries/src/commands/janus_interop_collector.rs b/interop_binaries/src/commands/janus_interop_collector.rs index a0e0dba26..5d23f5799 100644 --- a/interop_binaries/src/commands/janus_interop_collector.rs +++ b/interop_binaries/src/commands/janus_interop_collector.rs @@ -33,7 +33,7 @@ use prio::{ flp::gadgets::ParallelSum, vdaf::{self, prio3::Prio3}, }; -use rand::{distr::StandardUniform, prelude::Distribution, random}; +use rand::{RngExt, distr::StandardUniform, prelude::Distribution, random}; use reqwest::Url; use serde::{Deserialize, Serialize}; use tokio::{sync::Mutex, task::JoinHandle}; diff --git a/messages/src/lib.rs b/messages/src/lib.rs index c8cebf91d..0e842d270 100644 --- a/messages/src/lib.rs +++ b/messages/src/lib.rs @@ -25,7 +25,7 @@ use prio::{ }, topology::ping_pong::PingPongMessage, }; -use rand::{Rng, distr::StandardUniform, prelude::Distribution}; +use rand::{Rng, RngExt, distr::StandardUniform, prelude::Distribution}; use serde::{ Deserialize, Serialize, Serializer, de::{self, Visitor},