From 6d732c07b11a8bd101046c4cdacc1d547d6a4064 Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Sat, 8 Mar 2025 21:54:39 -0800 Subject: [PATCH 1/3] move ff back to release branch --- Cargo.lock | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++--- Cargo.toml | 2 +- 2 files changed, 63 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1a2f3ae29..273bc1219 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,6 +2,17 @@ # It is not intended for manual editing. version = 4 +[[package]] +name = "addchain" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b2e69442aa5628ea6951fa33e24efe8313f4321a91bd729fc2f75bdfc858570" +dependencies = [ + "num-bigint", + "num-integer", + "num-traits", +] + [[package]] name = "aead" version = "0.6.0-rc.0" @@ -237,12 +248,29 @@ dependencies = [ [[package]] name = "ff" version = "0.13.0" +source = "git+https://github.com/zkcrypto/ff.git?branch=release-0.14.0#1bb634588722b1b7ce986d239c263e332bedda7f" dependencies = [ "bitvec", + "ff_derive", "rand_core", "subtle", ] +[[package]] +name = "ff_derive" +version = "0.13.0" +source = "git+https://github.com/zkcrypto/ff.git?branch=release-0.14.0#1bb634588722b1b7ce986d239c263e332bedda7f" +dependencies = [ + "addchain", + "cfg-if", + "num-bigint", + "num-integer", + "num-traits", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "funty" version = "2.0.0" @@ -368,6 +396,26 @@ version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +[[package]] +name = "num-bigint" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f6f7833f2cbf2360a6cfd58cd41a53aa7a90bd4c202f5b1c7dd2ed73c57b2c3" +dependencies = [ + "autocfg", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-integer" +version = "0.1.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +dependencies = [ + "num-traits", +] + [[package]] name = "num-traits" version = "0.2.19" @@ -477,7 +525,7 @@ checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.98", ] [[package]] @@ -538,7 +586,7 @@ version = "2.2.0" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.98", ] [[package]] @@ -563,6 +611,17 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "syn" version = "2.0.98" @@ -708,7 +767,7 @@ checksum = "eea57037071898bf96a6da35fd626f4f27e9cee3ead2a6c703cf09d472b2e700" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.98", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 04a65869c..905882fd6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,7 @@ crypto-bigint = { git = "https://github.com/RustCrypto/crypto-bigint.git" } # https://github.com/zkcrypto/ff/pull/122 # https://github.com/zkcrypto/ff/pull/126 # https://github.com/zkcrypto/ff/pull/127 -ff = { git = "https://github.com/baloo/ff.git", branch = "baloo/try_from_rng" } +ff = { git = "https://github.com/zkcrypto/ff.git", branch = "release-0.14.0" } # https://github.com/zkcrypto/group/pull/56 group = { git = "https://github.com/pinkforest/group.git", branch = "bump-rand-0.9" } From 339e1f3bff654fb5a722dc9ec036fa3473e24ac3 Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Sat, 8 Mar 2025 23:15:59 -0800 Subject: [PATCH 2/3] use sha 0.11.0-pre.5 --- Cargo.lock | 10 ++++++---- Cargo.toml | 3 --- elliptic-curve/Cargo.toml | 4 ++-- signature/Cargo.toml | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 273bc1219..c9aede1b9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -552,8 +552,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.11.0-pre.4" -source = "git+https://github.com/RustCrypto/hashes#479ad0b5b48bc6044aa10a9896ccd54f28f0cccc" +version = "0.11.0-pre.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19b4241d1a56954dce82cecda5c8e9c794eef6f53abe5e5216bac0a0ea71ffa7" dependencies = [ "cfg-if", "cpufeatures", @@ -562,8 +563,9 @@ dependencies = [ [[package]] name = "sha3" -version = "0.11.0-pre.4" -source = "git+https://github.com/RustCrypto/hashes#479ad0b5b48bc6044aa10a9896ccd54f28f0cccc" +version = "0.11.0-pre.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bc997d7a5fa67cc1e352b2001124d28edb948b4e7a16567f9b3c1e51952524" dependencies = [ "digest 0.11.0-pre.10 (registry+https://github.com/rust-lang/crates.io-index)", "keccak", diff --git a/Cargo.toml b/Cargo.toml index 905882fd6..21a734666 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,9 +18,6 @@ members = [ [patch.crates-io] signature = { path = "signature" } -sha2 = { git = "https://github.com/RustCrypto/hashes" } -sha3 = { git = "https://github.com/RustCrypto/hashes" } - # https://github.com/RustCrypto/MACs/pull/178 hmac = { git = "https://github.com/RustCrypto/MACs.git" } diff --git a/elliptic-curve/Cargo.toml b/elliptic-curve/Cargo.toml index b5c0915e0..ec79dad51 100644 --- a/elliptic-curve/Cargo.toml +++ b/elliptic-curve/Cargo.toml @@ -40,8 +40,8 @@ tap = { version = "1.0.1", optional = true, default-features = false } # hack fo [dev-dependencies] hex-literal = "1" -sha2 = "=0.11.0-pre.4" -sha3 = "=0.11.0-pre.4" +sha2 = "=0.11.0-pre.5" +sha3 = "=0.11.0-pre.5" [features] default = ["arithmetic"] diff --git a/signature/Cargo.toml b/signature/Cargo.toml index c8a0047dd..0f1e3dae7 100644 --- a/signature/Cargo.toml +++ b/signature/Cargo.toml @@ -20,7 +20,7 @@ rand_core = { version = "0.9", optional = true, default-features = false } [dev-dependencies] hex-literal = "1" -sha2 = { version = "=0.11.0-pre.4", default-features = false } +sha2 = { version = "=0.11.0-pre.5", default-features = false } [features] alloc = [] From 69111bcaab1c68c0f71d89e3c049298ee76015d6 Mon Sep 17 00:00:00 2001 From: Arthur Gautier Date: Sat, 8 Mar 2025 23:19:36 -0800 Subject: [PATCH 3/3] disable minimal-version --- .github/workflows/cipher.yml | 1 + .github/workflows/crypto.yml | 1 + .github/workflows/password-hash.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/workflows/cipher.yml b/.github/workflows/cipher.yml index f60132124..048b0c562 100644 --- a/.github/workflows/cipher.yml +++ b/.github/workflows/cipher.yml @@ -42,6 +42,7 @@ jobs: # TODO: use the reusable workflow after this crate will be part of the # root workspace minimal-versions: + if: false # disabled until we stop using pre-releases runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/crypto.yml b/.github/workflows/crypto.yml index 7e197e877..e2926600c 100644 --- a/.github/workflows/crypto.yml +++ b/.github/workflows/crypto.yml @@ -39,6 +39,7 @@ jobs: --features aead,cipher,digest,elliptic-curve,signature,universal-hash minimal-versions: + if: false # disabled until we stop using pre-releases runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/password-hash.yml b/.github/workflows/password-hash.yml index 0fe8ef3b4..670fd7e54 100644 --- a/.github/workflows/password-hash.yml +++ b/.github/workflows/password-hash.yml @@ -41,6 +41,7 @@ jobs: # TODO: use the reusable workflow after this crate will be part of the # toot workspace minimal-versions: + if: false # disabled until we stop using pre-releases runs-on: ubuntu-latest steps: - uses: actions/checkout@v4