diff --git a/.github/workflows/chacha20.yml b/.github/workflows/chacha20.yml index cdf2191d..d79583e7 100644 --- a/.github/workflows/chacha20.yml +++ b/.github/workflows/chacha20.yml @@ -44,6 +44,7 @@ jobs: minimal-versions: uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master + if: false with: working-directory: ${{ github.workflow }} diff --git a/Cargo.lock b/Cargo.lock index 342e2cdc..584a71db 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -61,7 +61,7 @@ dependencies = [ "hex-literal", "proptest", "rand_chacha", - "rand_core", + "rand_core 0.10.0-rc.1", "zeroize", ] @@ -140,9 +140,9 @@ dependencies = [ [[package]] name = "hex-literal" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcaaec4551594c969335c98c903c1397853d4198408ea609190f420500f6be71" +checksum = "e712f64ec3850b98572bffac52e2c6f282b29fe6c5fa6d42334b30be438d95c1" [[package]] name = "hybrid-array" @@ -163,12 +163,6 @@ dependencies = [ "hybrid-array", ] -[[package]] -name = "lazy_static" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" - [[package]] name = "libc" version = "0.2.177" @@ -207,23 +201,22 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.101" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de" +checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8" dependencies = [ "unicode-ident", ] [[package]] name = "proptest" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb0be07becd10686a0bb407298fb425360a5c44a663774406340c59a22de4ce" +checksum = "bee689443a2bd0a16ab0348b52ee43e3b2d1b1f931c8aa5c9f8de4c86fbe8c40" dependencies = [ "bit-set", "bit-vec", "bitflags", - "lazy_static", "num-traits", "rand", "rand_chacha", @@ -270,7 +263,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" dependencies = [ "rand_chacha", - "rand_core", + "rand_core 0.9.3", ] [[package]] @@ -280,7 +273,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" dependencies = [ "ppv-lite86", - "rand_core", + "rand_core 0.9.3", ] [[package]] @@ -292,13 +285,18 @@ dependencies = [ "getrandom", ] +[[package]] +name = "rand_core" +version = "0.10.0-rc.1" +source = "git+https://github.com/rust-random/rand?branch=push-spqltotzmryv#74ad09bb14bcacf7f13080803d120803865f34e5" + [[package]] name = "rand_xorshift" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a" dependencies = [ - "rand_core", + "rand_core 0.9.3", ] [[package]] @@ -351,9 +349,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.107" +version = "2.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a26dbd934e5451d21ef060c018dae56fc073894c5a7896f882928a76e6d081b" +checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917" dependencies = [ "proc-macro2", "quote", @@ -387,9 +385,9 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[package]] name = "unicode-ident" -version = "1.0.19" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d" +checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5" [[package]] name = "wait-timeout" diff --git a/Cargo.toml b/Cargo.toml index 26910c8c..178feb0e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,3 +10,7 @@ members = [ [profile.dev] opt-level = 2 + +[patch.crates-io] +# TODO: remove after rand_core v0.10.0-rc.1 is released +rand_core = { git = "https://github.com/rust-random/rand", branch = "push-spqltotzmryv" } diff --git a/chacha20/Cargo.toml b/chacha20/Cargo.toml index 840c3db3..6e732524 100644 --- a/chacha20/Cargo.toml +++ b/chacha20/Cargo.toml @@ -21,7 +21,7 @@ rand_core-compatible RNGs based on those ciphers. [dependencies] cfg-if = "1" cipher = { version = "0.5.0-rc.1", optional = true, features = ["stream-wrapper"] } -rand_core = { version = "0.9", optional = true, default-features = false } +rand_core = { version = "0.10.0-rc.1", optional = true, default-features = false } # `zeroize` is an explicit dependency because this crate may be used without the `cipher` crate zeroize = { version = "1.8.1", optional = true, default-features = false } diff --git a/chacha20/tests/rng.rs b/chacha20/tests/rng.rs index 89e31149..1d44e26b 100644 --- a/chacha20/tests/rng.rs +++ b/chacha20/tests/rng.rs @@ -3,6 +3,7 @@ #![cfg(feature = "rand_core")] use proptest::prelude::*; +use rand_chacha::rand_core::{RngCore as OldRngCore, SeedableRng as OldSeedableRng}; use rand_core::{RngCore, SeedableRng}; // Number of reads to perform from the RNG in equivalence tests