From df3d1a6444166f535bca976f2892f8f387cbbb45 Mon Sep 17 00:00:00 2001
From: Tony Arcieri <bascule@gmail.com>
Date: Fri, 21 Nov 2025 17:13:54 -0700
Subject: [PATCH] elliptic-curve: use `rustcrypto-ff`/`rustcrypto-group`

Switches (hopefully temporarily) to our forks of the `ff` and `group`
crates containing updates to `rand_core` v0.10.0 prereleases, which
allows us to cut crate releases of `elliptic-curve` and all of its
dependent crates
---
 Cargo.lock                | 77 ++++++++++++++++++++-------------------
 Cargo.toml                |  3 --
 elliptic-curve/Cargo.toml |  4 +-
 3 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 89b20de1e..157ed354c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -187,9 +187,7 @@ dependencies = [
  "base16ct",
  "crypto-bigint",
  "digest",
- "ff",
  "getrandom",
- "group",
  "hex-literal",
  "hkdf",
  "hybrid-array",
@@ -197,37 +195,14 @@ dependencies = [
  "pem-rfc7468",
  "pkcs8",
  "rand_core",
+ "rustcrypto-ff",
+ "rustcrypto-group",
  "sec1",
  "serdect",
  "subtle",
  "zeroize",
 ]
 
-[[package]]
-name = "ff"
-version = "0.14.0-pre.0"
-source = "git+https://github.com/tarcieri/ff?branch=rand_core%2Fv0.10.0-rc-2#470e52fa35f7f6cb59f1f005003a14ac50b50cfd"
-dependencies = [
- "bitvec",
- "ff_derive",
- "rand_core",
- "subtle",
-]
-
-[[package]]
-name = "ff_derive"
-version = "0.14.0-pre.0"
-source = "git+https://github.com/tarcieri/ff?branch=rand_core%2Fv0.10.0-rc-2#470e52fa35f7f6cb59f1f005003a14ac50b50cfd"
-dependencies = [
- "addchain",
- "num-bigint",
- "num-integer",
- "num-traits",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "funty"
 version = "2.0.0"
@@ -246,16 +221,6 @@ dependencies = [
  "wasip2",
 ]
 
-[[package]]
-name = "group"
-version = "0.14.0-pre.0"
-source = "git+https://github.com/tarcieri/group?branch=rand_core%2Fv0.10.0-rc-2#50640b46d5f7eff37aee24d76e991c18444f372e"
-dependencies = [
- "ff",
- "rand_core",
- "subtle",
-]
-
 [[package]]
 name = "hex-literal"
 version = "1.1.0"
@@ -426,6 +391,44 @@ version = "0.10.0-rc-2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "104a23e4e8b77312a823b6b5613edbac78397e2f34320bc7ac4277013ec4478e"
 
+[[package]]
+name = "rustcrypto-ff"
+version = "0.14.0-pre.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa9cd37111549306f79b09aa2618e15b1e8241b7178c286821e3dd71579db4db"
+dependencies = [
+ "bitvec",
+ "rand_core",
+ "rustcrypto-ff_derive",
+ "subtle",
+]
+
+[[package]]
+name = "rustcrypto-ff_derive"
+version = "0.14.0-pre.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2aef88cb4ddb3b1c83beff963f9197607dac780cc39a09f19c041dacbb0b6a5"
+dependencies = [
+ "addchain",
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "rustcrypto-group"
+version = "0.14.0-pre.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e394cd734b5f97dfc3484fa42aad7acd912961c2bcd96c99aa05b3d6cab7cafd"
+dependencies = [
+ "rand_core",
+ "rustcrypto-ff",
+ "subtle",
+]
+
 [[package]]
 name = "sec1"
 version = "0.8.0-rc.10"
diff --git a/Cargo.toml b/Cargo.toml
index 513d29043..f89b4edce 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,6 +16,3 @@ members = [
 [patch.crates-io]
 digest = { path = "digest" }
 signature = { path = "signature" }
-
-ff = { git = "https://github.com/tarcieri/ff", branch = "rand_core/v0.10.0-rc-2" }
-group = { git = "https://github.com/tarcieri/group", branch = "rand_core/v0.10.0-rc-2" }
diff --git a/elliptic-curve/Cargo.toml b/elliptic-curve/Cargo.toml
index 1a1cd8cbc..5696de6e0 100644
--- a/elliptic-curve/Cargo.toml
+++ b/elliptic-curve/Cargo.toml
@@ -26,9 +26,9 @@ zeroize = { version = "1.7", default-features = false }
 
 # optional dependencies
 digest = { version = "0.11.0-rc.4", optional = true }
-ff = { version = "=0.14.0-pre.0", optional = true, default-features = false }
+ff = { version = "=0.14.0-pre.0", package = "rustcrypto-ff", optional = true, default-features = false }
 getrandom = { version = "0.3", optional = true }
-group = { version = "=0.14.0-pre.0", optional = true, default-features = false }
+group = { version = "=0.14.0-pre.0", package = "rustcrypto-group", optional = true, default-features = false }
 hkdf = { version = "0.13.0-rc.3", optional = true, default-features = false }
 hex-literal = { version = "1", optional = true }
 once_cell = { version = "1.21", optional = true, default-features = false }