Migrate to ff 0.14, rand 0.9

Cargo.toml

@@ -14,37 +14,18 @@ version = "0.10.0"
 edition = "2021"
 rust-version = "1.63"
 
-[dependencies.bitvec]
-version = "1"
-default-features = false
-
-[dependencies.bls12_381]
-version = "0.8"
-default-features = false
-
-[dependencies.ff]
-version = "0.13"
-default-features = false
-
-[dependencies.group]
-version = "0.13"
-default-features = false
-
-[dependencies.rand_core]
-version = "0.6"
-default-features = false
-
-[dependencies.subtle]
-version = "^2.2.1"
-default-features = false
+[dependencies]
+bitvec = { version = "1", default-features = false }
+bls12_381 = { version = "0.8", default-features = false }
+ff = { version = "=0.14.0-pre.0", default-features = false }
+group = { version = "=0.14.0-pre.0", default-features = false }
+rand_core = { version = "0.9", default-features = false }
+subtle = { version = "^2.2.1", default-features = false }
 
 [dev-dependencies]
 criterion = "0.3"
 csv = ">= 1.0, < 1.2" # csv 1.2 has MSRV 1.60
-
-[dev-dependencies.rand_xorshift]
-version = "0.3"
-default-features = false
+rand_xorshift = { version = "0.4", default-features = false }
 
 [features]
 default = ["alloc", "bits"]
@@ -62,3 +43,6 @@ harness = false
 [[bench]]
 name = "point_bench"
 harness = false
+
+[patch.crates-io]
+bls12_381 = { git = "https://github.com/zkcrypto/bls12_381.git", rev = "d5df9da6b20619bf77cc432447c02f8f6a6a1fb3" }

RELEASES.md

@@ -1,6 +1,7 @@
 # Unreleased
 ## Changed
 - Bumped MSRV to `1.63.0`
+- Bumped dependencies to `bls12_381 0.9`, `ff 0.14`, `group 0.14`.
 
 # 0.10.0
 ## Changed

src/fr.rs

@@ -6,7 +6,7 @@ use core::fmt;
 use core::ops::{Add, AddAssign, Mul, MulAssign, Neg, Sub, SubAssign};
 
 use ff::{Field, PrimeField};
-use rand_core::RngCore;
+use rand_core::TryRngCore;
 use subtle::{Choice, ConditionallySelectable, ConstantTimeEq, CtOption};
 
 #[cfg(feature = "bits")]
@@ -681,10 +681,10 @@ impl Field for Fr {
     const ZERO: Self = Self::zero();
     const ONE: Self = Self::one();
 
-    fn random(mut rng: impl RngCore) -> Self {
+    fn try_from_rng<R: TryRngCore + ?Sized>(rng: &mut R) -> Result<Self, R::Error> {
         let mut buf = [0; 64];
-        rng.fill_bytes(&mut buf);
-        Self::from_bytes_wide(&buf)
+        rng.try_fill_bytes(&mut buf)?;
+        Ok(Self::from_bytes_wide(&buf))
     }
 
     #[must_use]

src/lib.rs

@@ -46,7 +46,7 @@ use group::{
     prime::PrimeGroup,
     Curve, Group, GroupEncoding,
 };
-use rand_core::RngCore;
+use rand_core::TryRngCore;
 use subtle::{Choice, ConditionallySelectable, ConstantTimeEq, CtOption};
 
 #[cfg(feature = "alloc")]
@@ -1241,10 +1241,10 @@ impl_binops_multiplicative!(SubgroupPoint, Fr);
 impl Group for ExtendedPoint {
     type Scalar = Fr;
 
-    fn random(mut rng: impl RngCore) -> Self {
+    fn try_from_rng<R: TryRngCore + ?Sized>(rng: &mut R) -> Result<Self, R::Error> {
         loop {
-            let v = Fq::random(&mut rng);
-            let flip_sign = rng.next_u32() % 2 != 0;
+            let v = Fq::try_from_rng(rng)?;
+            let flip_sign = rng.try_next_u32()? % 2 != 0;
 
             // See AffinePoint::from_bytes for details.
             let v2 = v.square();
@@ -1260,7 +1260,7 @@ impl Group for ExtendedPoint {
                 let p = p.unwrap().to_curve();
 
                 if bool::from(!p.is_identity()) {
-                    return p;
+                    return Ok(p);
                 }
             }
         }
@@ -1287,12 +1287,12 @@ impl Group for ExtendedPoint {
 impl Group for SubgroupPoint {
     type Scalar = Fr;
 
-    fn random(mut rng: impl RngCore) -> Self {
+    fn try_from_rng<R: TryRngCore + ?Sized>(rng: &mut R) -> Result<Self, R::Error> {
         loop {
-            let p = ExtendedPoint::random(&mut rng).clear_cofactor();
+            let p = ExtendedPoint::try_from_rng(rng)?.clear_cofactor();
 
             if bool::from(!p.is_identity()) {
-                return p;
+                return Ok(p);
             }
         }
     }