Skip to content

move ff back to release branch #1788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tarcieri merged 3 commits into from
Mar 9, 2025
Merged

move ff back to release branch #1788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d732c0
move ff back to release branch
baloo Mar 9, 2025
339e1f3
use sha 0.11.0-pre.5
baloo Mar 9, 2025
69111bc
disable minimal-version
baloo Mar 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/cipher.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop

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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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