Skip to content

Commit

Permalink
move ff back to release branch (#1788)
Browse files Browse the repository at this point in the history
  • Loading branch information
baloo authored Mar 9, 2025
1 parent 1548d2a commit f9a24b0
Show file tree
Hide file tree
Showing 7 changed files with 75 additions and 14 deletions.
1 change: 1 addition & 0 deletions .github/workflows/cipher.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/crypto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/password-hash.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
75 changes: 68 additions & 7 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 1 addition & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }

Expand All @@ -31,7 +28,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" }
4 changes: 2 additions & 2 deletions elliptic-curve/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion signature/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 = []
Expand Down

0 comments on commit f9a24b0

Please sign in to comment.