From 89290aa0d3bfe867159cd1a23762071856b9d56e Mon Sep 17 00:00:00 2001
From: Arthur Gautier <arthur.gautier@arista.com>
Date: Wed, 23 Apr 2025 16:00:52 -0700
Subject: [PATCH] Bump to `signature` 3

---
 Cargo.lock           | 39 +++++++++++++++++++++++++++------------
 Cargo.toml           |  1 -
 cms/Cargo.toml       |  2 +-
 x509-cert/Cargo.toml |  2 +-
 x509-ocsp/Cargo.toml |  2 +-
 5 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 416699bef..ef01969de 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -20,7 +20,7 @@ checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 [[package]]
 name = "aead"
 version = "0.6.0-rc.0"
-source = "git+https://github.com/RustCrypto/traits.git#2dc47f8d1461a2a7a22b68e2afafeb4b59e13420"
+source = "git+https://github.com/RustCrypto/traits.git#ac5443909846354e11570e2968937a62f2019bed"
 dependencies = [
  "crypto-common",
  "inout",
@@ -399,8 +399,9 @@ checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929"
 
 [[package]]
 name = "crypto-bigint"
-version = "0.7.0-pre.0"
-source = "git+https://github.com/RustCrypto/crypto-bigint.git#e97beae6593c30b4477b7f29e30e5372cd8204bf"
+version = "0.7.0-pre.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87a5061ea0870b06f7fdd5a0f7268e30c04de1932c148cca0ce5c79a88d18bed"
 dependencies = [
  "hybrid-array",
  "num-traits",
@@ -413,7 +414,7 @@ dependencies = [
 [[package]]
 name = "crypto-common"
 version = "0.2.0-rc.2"
-source = "git+https://github.com/RustCrypto/traits.git#2dc47f8d1461a2a7a22b68e2afafeb4b59e13420"
+source = "git+https://github.com/RustCrypto/traits.git#ac5443909846354e11570e2968937a62f2019bed"
 dependencies = [
  "hybrid-array",
  "rand_core 0.9.3",
@@ -506,7 +507,7 @@ dependencies = [
 [[package]]
 name = "ecdsa"
 version = "0.17.0-pre.9"
-source = "git+https://github.com/RustCrypto/signatures.git#34cd7792c248e36693d617968d38c14d4ab4618a"
+source = "git+https://github.com/RustCrypto/signatures.git#d2a93b3d5a45a54c19ef29ddc009d9ad22d8b057"
 dependencies = [
  "der",
  "digest",
@@ -514,6 +515,7 @@ dependencies = [
  "rfc6979",
  "signature",
  "spki",
+ "zeroize",
 ]
 
 [[package]]
@@ -525,7 +527,7 @@ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 [[package]]
 name = "elliptic-curve"
 version = "0.14.0-rc.1"
-source = "git+https://github.com/RustCrypto/traits.git#2dc47f8d1461a2a7a22b68e2afafeb4b59e13420"
+source = "git+https://github.com/RustCrypto/traits.git#ac5443909846354e11570e2968937a62f2019bed"
 dependencies = [
  "base16ct",
  "crypto-bigint",
@@ -903,10 +905,11 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 [[package]]
 name = "p256"
 version = "0.14.0-pre.2"
-source = "git+https://github.com/RustCrypto/elliptic-curves.git#5ecd4718f9ce0ba092bc34edb981d63f75ed74a3"
+source = "git+https://github.com/RustCrypto/elliptic-curves.git#e31132665d2d8440d806cb249c109e5f4b788708"
 dependencies = [
  "ecdsa",
  "elliptic-curve",
+ "primefield",
  "primeorder",
  "sha2",
 ]
@@ -1033,10 +1036,22 @@ dependencies = [
  "zerocopy",
 ]
 
+[[package]]
+name = "primefield"
+version = "0.14.0-pre.0"
+source = "git+https://github.com/RustCrypto/elliptic-curves.git#e31132665d2d8440d806cb249c109e5f4b788708"
+dependencies = [
+ "crypto-bigint",
+ "ff",
+ "rand_core 0.9.3",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "primeorder"
 version = "0.14.0-pre.2"
-source = "git+https://github.com/RustCrypto/elliptic-curves.git#5ecd4718f9ce0ba092bc34edb981d63f75ed74a3"
+source = "git+https://github.com/RustCrypto/elliptic-curves.git#e31132665d2d8440d806cb249c109e5f4b788708"
 dependencies = [
  "elliptic-curve",
 ]
@@ -1206,7 +1221,7 @@ checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2"
 [[package]]
 name = "rfc6979"
 version = "0.5.0-pre.4"
-source = "git+https://github.com/RustCrypto/signatures.git#34cd7792c248e36693d617968d38c14d4ab4618a"
+source = "git+https://github.com/RustCrypto/signatures.git#d2a93b3d5a45a54c19ef29ddc009d9ad22d8b057"
 dependencies = [
  "hmac",
  "subtle",
@@ -1237,7 +1252,7 @@ dependencies = [
 [[package]]
 name = "rsa"
 version = "0.10.0-pre.4"
-source = "git+https://github.com/RustCrypto/RSA.git#cba78063a10fd76d10569653a8372c2af395f414"
+source = "git+https://github.com/RustCrypto/RSA.git#471c06b15d3f5d735e4a34e7db9b56efce325014"
 dependencies = [
  "const-oid",
  "crypto-bigint",
@@ -1480,8 +1495,8 @@ dependencies = [
 
 [[package]]
 name = "signature"
-version = "2.3.0-pre.6"
-source = "git+https://github.com/RustCrypto/traits.git#2dc47f8d1461a2a7a22b68e2afafeb4b59e13420"
+version = "3.0.0-pre"
+source = "git+https://github.com/RustCrypto/traits.git#ac5443909846354e11570e2968937a62f2019bed"
 dependencies = [
  "digest",
  "rand_core 0.9.3",
diff --git a/Cargo.toml b/Cargo.toml
index 9f7f7875c..97ad350bb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -92,7 +92,6 @@ rsa = { git = "https://github.com/RustCrypto/RSA.git" }
 pbkdf2 = { git = "https://github.com/RustCrypto/password-hashes.git" }
 scrypt = { git = "https://github.com/RustCrypto/password-hashes.git" }
 
-crypto-bigint = { git = "https://github.com/RustCrypto/crypto-bigint.git" }
 crypto-primes = { git = "https://github.com/entropyxyz/crypto-primes.git" }
 
 # https://github.com/RustCrypto/elliptic-curves/pull/1125
diff --git a/cms/Cargo.toml b/cms/Cargo.toml
index fe3e68262..85636f404 100644
--- a/cms/Cargo.toml
+++ b/cms/Cargo.toml
@@ -32,7 +32,7 @@ rsa = { version = "=0.10.0-pre.4", optional = true }
 sha1 = { version = "=0.11.0-pre.5", optional = true }
 sha2 = { version = "=0.11.0-pre.5", optional = true }
 sha3 = { version = "=0.11.0-pre.5", optional = true }
-signature = { version = "=2.3.0-pre.6", features = ["digest", "alloc"], optional = true }
+signature = { version = "=3.0.0-pre", features = ["digest", "alloc"], optional = true }
 zeroize = { version = "1.8.1", optional = true }
 
 [dev-dependencies]
diff --git a/x509-cert/Cargo.toml b/x509-cert/Cargo.toml
index b805a02d0..2b3c75004 100644
--- a/x509-cert/Cargo.toml
+++ b/x509-cert/Cargo.toml
@@ -24,7 +24,7 @@ spki = { version = "0.8.0-rc.0", features = ["alloc"] }
 arbitrary = { version = "1.4", features = ["derive"], optional = true }
 digest = { version = "0.11.0-pre.10", optional = true, default-features = false }
 sha1 = { version = "0.11.0-pre.5", default-features = false, optional = true }
-signature = { version = "=2.3.0-pre.6", features = ["rand_core"], optional = true }
+signature = { version = "=3.0.0-pre", features = ["rand_core"], optional = true }
 tls_codec = { version = "0.4.0", default-features = false, features = ["derive"], optional = true }
 
 [dev-dependencies]
diff --git a/x509-ocsp/Cargo.toml b/x509-ocsp/Cargo.toml
index f0e26d506..d0cc8d001 100644
--- a/x509-ocsp/Cargo.toml
+++ b/x509-ocsp/Cargo.toml
@@ -24,7 +24,7 @@ x509-cert = { version = "=0.3.0-pre.0", default-features = false }
 # Optional
 digest = { version = "=0.11.0-pre.10", optional = true, default-features = false, features = ["oid"] }
 rand_core = { version = "0.9", optional = true, default-features = false }
-signature = { version = "=2.3.0-pre.6", optional = true, default-features = false, features = ["digest", "rand_core"] }
+signature = { version = "=3.0.0-pre", optional = true, default-features = false, features = ["digest", "rand_core"] }
 
 [dev-dependencies]
 hex-literal = "1"