Skip to content

Commit 9bcce22

Browse files
tarcieritarcieri
committed
Bump rand_core to v0.10.0-rc-6
1 parent dbd8e6c commit 9bcce22

5 files changed

Lines changed: 101 additions & 95 deletions

File tree

‎.github/workflows/ci.yml‎

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -37,42 +37,43 @@ jobs:
3737
- name: Verify working directory is clean (excluding lockfile)
3838
run: git diff --exit-code ':!Cargo.lock'
3939

40-
build-nodefault:
41-
name: Build target ${{ matrix.target }}
42-
runs-on: ubuntu-latest
43-
strategy:
44-
matrix:
45-
target:
46-
- wasm32-wasip1
47-
- thumbv6m-none-eabi
48-
- thumbv7em-none-eabihf
49-
steps:
50-
- uses: actions/checkout@v4
51-
with:
52-
path: crate_root
53-
# We use a synthetic crate to ensure no dev-dependencies are enabled, which can
54-
# be incompatible with some of these targets.
55-
- name: Create synthetic crate for testing
56-
run: cargo init --edition 2021 --lib ci-build
57-
- name: Copy Rust version into synthetic crate
58-
run: cp crate_root/rust-toolchain.toml ci-build/
59-
- name: Copy patch directives into synthetic crate
60-
run: |
61-
echo "[patch.crates-io]" >> ./ci-build/Cargo.toml
62-
cat ./crate_root/Cargo.toml | sed "0,/.\+\(patch.crates.\+\)/d" >> ./ci-build/Cargo.toml
63-
- name: Add no_std pragma to lib.rs
64-
run: |
65-
echo "#![no_std]" > ./ci-build/src/lib.rs
66-
- name: Add group as a dependency of the synthetic crate
67-
working-directory: ./ci-build
68-
# run: cargo add --no-default-features --path ../crate_root
69-
run: sed -i 's;\[dependencies\];\[dependencies\]\nrustcrypto-group = { path = "../crate_root", default-features = false };g' ./Cargo.toml
70-
- name: Add target
71-
working-directory: ./ci-build
72-
run: rustup target add ${{ matrix.target }}
73-
- name: Build for target
74-
working-directory: ./ci-build
75-
run: cargo build --verbose --target ${{ matrix.target }}
40+
# The scripts embedded in this job are having trouble parsing our branch names
41+
# build-nodefault:
42+
# name: Build target ${{ matrix.target }}
43+
# runs-on: ubuntu-latest
44+
# strategy:
45+
# matrix:
46+
# target:
47+
# - wasm32-wasip1
48+
# - thumbv6m-none-eabi
49+
# - thumbv7em-none-eabihf
50+
# steps:
51+
# - uses: actions/checkout@v4
52+
# with:
53+
# path: crate_root
54+
# # We use a synthetic crate to ensure no dev-dependencies are enabled, which can
55+
# # be incompatible with some of these targets.
56+
# - name: Create synthetic crate for testing
57+
# run: cargo init --edition 2021 --lib ci-build
58+
# - name: Copy Rust version into synthetic crate
59+
# run: cp crate_root/rust-toolchain.toml ci-build/
60+
# - name: Copy patch directives into synthetic crate
61+
# run: |
62+
# echo "[patch.crates-io]" >> ./ci-build/Cargo.toml
63+
# cat ./crate_root/Cargo.toml | sed "0,/.\+\(patch.crates.\+\)/d" >> ./ci-build/Cargo.toml
64+
# - name: Add no_std pragma to lib.rs
65+
# run: |
66+
# echo "#![no_std]" > ./ci-build/src/lib.rs
67+
# - name: Add group as a dependency of the synthetic crate
68+
# working-directory: ./ci-build
69+
# # run: cargo add --no-default-features --path ../crate_root
70+
# run: sed -i 's;\[dependencies\];\[dependencies\]\nrustcrypto-group = { path = "../crate_root", default-features = false };g' ./Cargo.toml
71+
# - name: Add target
72+
# working-directory: ./ci-build
73+
# run: rustup target add ${{ matrix.target }}
74+
# - name: Build for target
75+
# working-directory: ./ci-build
76+
# run: cargo build --verbose --target ${{ matrix.target }}
7677

7778
doc-links:
7879
name: Intra-doc links

‎Cargo.lock‎

Lines changed: 37 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@ homepage = "https://github.com/RustCrypto/group"
1616
repository = "https://github.com/RustCrypto/group"
1717

1818
[dependencies]
19-
ff = { version = "=0.14.0-pre.0", package = "rustcrypto-ff", default-features = false }
19+
chacha20 = { version = "0.10.0-rc.9", optional = true, default-features = false, features = ["rng"] }
20+
ff = { version = "=0.14.0-pre.1", package = "rustcrypto-ff", default-features = false }
2021
rand = { version = "0.10.0-rc.1", optional = true, default-features = false }
21-
rand_core = { version = "0.10.0-rc-2", default-features = false }
22-
rand_xorshift = { version = "0.5.0-rc.0", optional = true }
22+
rand_core = { version = "0.10.0-rc-6", default-features = false }
23+
#rand_xorshift = { version = "0.5.0-rc.0", optional = true }
2324
subtle = { version = "2.2.1", default-features = false }
2425

2526
# Crate for exposing the dynamic memory usage of the w-NAF structs.
@@ -28,8 +29,12 @@ memuse = { version = "0.2", optional = true }
2829
[features]
2930
default = ["alloc"]
3031
alloc = []
31-
tests = ["alloc", "rand", "rand_xorshift"]
32+
tests = ["alloc", "chacha20", "rand"] # "rand_xorshift"]
3233
wnaf-memuse = ["alloc", "memuse"]
3334

3435
[badges]
3536
maintenance = { status = "actively-developed" }
37+
38+
[patch.crates-io.rand]
39+
git = "https://github.com/rust-random/rand"
40+
branch = "rand_core/v0.10.0-rc-6"

‎src/lib.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use core::fmt;
1414
use core::iter::Sum;
1515
use core::ops::{Add, AddAssign, Mul, MulAssign, Neg, Sub, SubAssign};
1616
use ff::PrimeField;
17-
use rand_core::{RngCore, TryRngCore};
17+
use rand_core::{Rng, TryRng};
1818
use subtle::{Choice, CtOption};
1919

2020
pub mod cofactor;
@@ -77,7 +77,7 @@ pub trait Group:
7777
/// this group.
7878
///
7979
/// This function is non-deterministic, and samples from the user-provided RNG.
80-
fn random<R: RngCore + ?Sized>(rng: &mut R) -> Self {
80+
fn random<R: Rng + ?Sized>(rng: &mut R) -> Self {
8181
Self::try_from_rng(rng)
8282
.map_err(|e: Infallible| e)
8383
.expect("Infallible failed")
@@ -92,7 +92,7 @@ pub trait Group:
9292
/// this group.
9393
///
9494
/// This function is non-deterministic, and samples from the user-provided RNG.
95-
fn try_from_rng<R: TryRngCore + ?Sized>(rng: &mut R) -> Result<Self, R::Error>;
95+
fn try_from_rng<R: TryRng + ?Sized>(rng: &mut R) -> Result<Self, R::Error>;
9696

9797
/// Returns the additive identity, also known as the "neutral element".
9898
fn identity() -> Self;

‎src/tests/mod.rs‎

Lines changed: 15 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
use alloc::vec::Vec;
2+
use chacha20::ChaCha8Rng;
23
use core::ops::{Mul, Neg};
34
use ff::{Field, PrimeField};
45
use rand::SeedableRng;
5-
use rand_xorshift::XorShiftRng;
66

77
use crate::{
88
prime::{PrimeCurve, PrimeCurveAffine},
99
wnaf::WnafGroup,
1010
GroupEncoding, UncompressedEncoding,
1111
};
1212

13+
const RNG_SEED: [u8; 32] = [
14+
0x1f, 0x64, 0x25, 0xd1, 0x6c, 0xb5, 0xdf, 0x2, 0x6a, 0x72, 0xf6, 0x90, 0xa, 0x7a, 0xe1, 0x38,
15+
0x22, 0xb7, 0xa8, 0x11, 0xb, 0xcf, 0xf4, 0x74, 0x25, 0xd, 0x63, 0x24, 0x17, 0x96, 0xc8, 0x58,
16+
];
17+
1318
pub fn curve_tests<G: PrimeCurve>() {
14-
let mut rng = XorShiftRng::from_seed([
15-
0x59, 0x62, 0xbe, 0x5d, 0x76, 0x3d, 0x31, 0x8d, 0x17, 0xdb, 0x37, 0x32, 0x54, 0x06, 0xbc,
16-
0xe5,
17-
]);
19+
let mut rng = ChaCha8Rng::from_seed(RNG_SEED);
1820

1921
// Negation edge case with identity.
2022
{
@@ -72,10 +74,7 @@ pub fn curve_tests<G: PrimeCurve>() {
7274
pub fn random_wnaf_tests<G: WnafGroup>() {
7375
use crate::wnaf::*;
7476

75-
let mut rng = XorShiftRng::from_seed([
76-
0x59, 0x62, 0xbe, 0x5d, 0x76, 0x3d, 0x31, 0x8d, 0x17, 0xdb, 0x37, 0x32, 0x54, 0x06, 0xbc,
77-
0xe5,
78-
]);
77+
let mut rng = ChaCha8Rng::from_seed(RNG_SEED);
7978

8079
{
8180
let mut table = vec![];
@@ -189,10 +188,7 @@ pub fn random_wnaf_tests<G: WnafGroup>() {
189188
}
190189

191190
fn random_negation_tests<G: PrimeCurve>() {
192-
let mut rng = XorShiftRng::from_seed([
193-
0x59, 0x62, 0xbe, 0x5d, 0x76, 0x3d, 0x31, 0x8d, 0x17, 0xdb, 0x37, 0x32, 0x54, 0x06, 0xbc,
194-
0xe5,
195-
]);
191+
let mut rng = ChaCha8Rng::from_seed(RNG_SEED);
196192

197193
for _ in 0..1000 {
198194
let r = G::random(&mut rng);
@@ -219,10 +215,7 @@ fn random_negation_tests<G: PrimeCurve>() {
219215
}
220216

221217
fn random_doubling_tests<G: PrimeCurve>() {
222-
let mut rng = XorShiftRng::from_seed([
223-
0x59, 0x62, 0xbe, 0x5d, 0x76, 0x3d, 0x31, 0x8d, 0x17, 0xdb, 0x37, 0x32, 0x54, 0x06, 0xbc,
224-
0xe5,
225-
]);
218+
let mut rng = ChaCha8Rng::from_seed(RNG_SEED);
226219

227220
for _ in 0..1000 {
228221
let mut a = G::random(&mut rng);
@@ -247,10 +240,7 @@ fn random_doubling_tests<G: PrimeCurve>() {
247240
}
248241

249242
fn random_multiplication_tests<G: PrimeCurve>() {
250-
let mut rng = XorShiftRng::from_seed([
251-
0x59, 0x62, 0xbe, 0x5d, 0x76, 0x3d, 0x31, 0x8d, 0x17, 0xdb, 0x37, 0x32, 0x54, 0x06, 0xbc,
252-
0xe5,
253-
]);
243+
let mut rng = ChaCha8Rng::from_seed(RNG_SEED);
254244

255245
for _ in 0..1000 {
256246
let mut a = G::random(&mut rng);
@@ -282,10 +272,7 @@ fn random_multiplication_tests<G: PrimeCurve>() {
282272
}
283273

284274
fn random_addition_tests<G: PrimeCurve>() {
285-
let mut rng = XorShiftRng::from_seed([
286-
0x59, 0x62, 0xbe, 0x5d, 0x76, 0x3d, 0x31, 0x8d, 0x17, 0xdb, 0x37, 0x32, 0x54, 0x06, 0xbc,
287-
0xe5,
288-
]);
275+
let mut rng = ChaCha8Rng::from_seed(RNG_SEED);
289276

290277
for _ in 0..1000 {
291278
let a = G::random(&mut rng);
@@ -362,10 +349,7 @@ fn random_addition_tests<G: PrimeCurve>() {
362349
}
363350

364351
fn random_transformation_tests<G: PrimeCurve>() {
365-
let mut rng = XorShiftRng::from_seed([
366-
0x59, 0x62, 0xbe, 0x5d, 0x76, 0x3d, 0x31, 0x8d, 0x17, 0xdb, 0x37, 0x32, 0x54, 0x06, 0xbc,
367-
0xe5,
368-
]);
352+
let mut rng = ChaCha8Rng::from_seed(RNG_SEED);
369353

370354
for _ in 0..1000 {
371355
let g = G::random(&mut rng);
@@ -399,10 +383,7 @@ fn random_transformation_tests<G: PrimeCurve>() {
399383
}
400384

401385
fn random_compressed_encoding_tests<G: PrimeCurve>() {
402-
let mut rng = XorShiftRng::from_seed([
403-
0x59, 0x62, 0xbe, 0x5d, 0x76, 0x3d, 0x31, 0x8d, 0x17, 0xdb, 0x37, 0x32, 0x54, 0x06, 0xbc,
404-
0xe5,
405-
]);
386+
let mut rng = ChaCha8Rng::from_seed(RNG_SEED);
406387

407388
assert_eq!(
408389
G::Affine::from_bytes(&G::Affine::identity().to_bytes()).unwrap(),
@@ -428,10 +409,7 @@ pub fn random_uncompressed_encoding_tests<G: PrimeCurve>()
428409
where
429410
<G as PrimeCurve>::Affine: UncompressedEncoding,
430411
{
431-
let mut rng = XorShiftRng::from_seed([
432-
0x59, 0x62, 0xbe, 0x5d, 0x76, 0x3d, 0x31, 0x8d, 0x17, 0xdb, 0x37, 0x32, 0x54, 0x06, 0xbc,
433-
0xe5,
434-
]);
412+
let mut rng = ChaCha8Rng::from_seed(RNG_SEED);
435413

436414
assert_eq!(
437415
G::Affine::from_uncompressed(&G::Affine::identity().to_uncompressed()).unwrap(),

0 commit comments

Comments
 (0)