Skip to content

Commit c4cd5eb

Browse files
authored
(async-)signature: MSRV 1.60 (#1387)
To simplify the workspace, which contains weak/namespaced features, this bumps both `async-signature` and `signature` to MSRV 1.60. So as for the bump to have some justification, it adds weak feature activation for `rand_core?/std`, and uses this impl to write a `From<rand_core::Error>` conversion which can preserve the original error as the boxed source.
1 parent b3313d9 commit c4cd5eb

File tree

11 files changed

+77
-213
lines changed

11 files changed

+77
-213
lines changed

.github/workflows/async-signature.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
matrix:
2424
rust:
25-
- 1.56.0 # MSRV
25+
- 1.60.0 # MSRV
2626
- stable
2727
steps:
2828
- uses: actions/checkout@v4

.github/workflows/signature.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
strategy:
2424
matrix:
2525
rust:
26-
- 1.56.0 # MSRV
26+
- 1.60.0 # MSRV
2727
- stable
2828
target:
2929
- thumbv7em-none-eabi
@@ -51,7 +51,7 @@ jobs:
5151
strategy:
5252
matrix:
5353
rust:
54-
- 1.56.0 # MSRV
54+
- 1.60.0 # MSRV
5555
- stable
5656
steps:
5757
- uses: actions/checkout@v4
@@ -69,7 +69,7 @@ jobs:
6969
strategy:
7070
matrix:
7171
rust:
72-
- 1.56.0 # MSRV
72+
- 1.60.0 # MSRV
7373
- stable
7474
steps:
7575
- uses: actions/checkout@v4

Cargo.lock

Lines changed: 48 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,9 @@ members = [
99
"elliptic-curve",
1010
"kem",
1111
"password-hash",
12-
"universal-hash",
13-
]
14-
# TODO: re-add to `members` when MSRV has been bumped to 1.60+
15-
exclude = [
1612
"signature",
1713
"signature/async",
14+
"universal-hash",
1815
]
1916

2017
[patch.crates-io]

crypto/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ cipher = { version = "0.4", optional = true }
2121
digest = { version = "0.10", optional = true, features = ["mac"] }
2222
elliptic-curve = { version = "0.13", optional = true, path = "../elliptic-curve" }
2323
password-hash = { version = "0.5", optional = true, path = "../password-hash" }
24-
signature = { version = "2", optional = true, default-features = false, path = "../signature" }
24+
signature = { version = "2", optional = true, default-features = false }
2525
universal-hash = { version = "0.5", optional = true }
2626

2727
[features]

signature/Cargo.lock

Lines changed: 0 additions & 189 deletions
This file was deleted.

signature/Cargo.toml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "signature"
33
description = "Traits for cryptographic signature algorithms (e.g. ECDSA, Ed25519)"
4-
version = "2.1.0"
4+
version = "2.2.0-pre"
55
authors = ["RustCrypto Developers"]
66
license = "Apache-2.0 OR MIT"
77
documentation = "https://docs.rs/signature"
@@ -10,7 +10,7 @@ readme = "README.md"
1010
keywords = ["crypto", "ecdsa", "ed25519", "signature", "signing"]
1111
categories = ["cryptography", "no-std"]
1212
edition = "2021"
13-
rust-version = "1.56"
13+
rust-version = "1.60"
1414

1515
[dependencies]
1616
derive = { package = "signature_derive", version = "2", optional = true, path = "derive" }
@@ -23,12 +23,8 @@ sha2 = { version = "0.10", default-features = false }
2323

2424
[features]
2525
alloc = []
26-
std = ["alloc"]
26+
std = ["alloc", "rand_core?/std"]
2727

2828
[package.metadata.docs.rs]
2929
all-features = true
3030
rustdoc-args = ["--cfg", "docsrs"]
31-
32-
# TODO(tarcieri): remove when these crates are added to toplevel `members`
33-
[workspace]
34-
members = [".", "async"]

signature/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ the [RustCrypto] organization, as well as [`ed25519-dalek`].
1717

1818
## Minimum Supported Rust Version
1919

20-
Rust **1.56** or higher.
20+
Rust **1.60** or higher.
2121

2222
Minimum supported Rust version can be changed in the future, but it will be
2323
done with a minor version bump.
@@ -56,7 +56,7 @@ dual licensed as above, without any additional terms or conditions.
5656
[build-image]: https://github.com/RustCrypto/traits/actions/workflows/signature.yml/badge.svg
5757
[build-link]: https://github.com/RustCrypto/traits/actions/workflows/signature.yml
5858
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
59-
[rustc-image]: https://img.shields.io/badge/rustc-1.56+-blue.svg
59+
[rustc-image]: https://img.shields.io/badge/rustc-1.60+-blue.svg
6060
[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
6161
[chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260048-signatures
6262

signature/async/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "async-signature"
33
description = "Traits for cryptographic signature algorithms (e.g. ECDSA, Ed25519)"
4-
version = "0.3.0"
4+
version = "0.4.0-pre"
55
authors = ["RustCrypto Developers"]
66
license = "Apache-2.0 OR MIT"
77
documentation = "https://docs.rs/async-signature"
@@ -10,11 +10,11 @@ readme = "README.md"
1010
keywords = ["crypto", "ecdsa", "ed25519", "signature", "signing"]
1111
categories = ["cryptography", "no-std"]
1212
edition = "2021"
13-
rust-version = "1.56"
13+
rust-version = "1.60"
1414

1515
[dependencies]
1616
async-trait = "0.1.9"
17-
signature = { version = "2.0, <2.2", path = ".." }
17+
signature = { version = "=2.2.0-pre", path = ".." }
1818

1919
[features]
2020
digest = ["signature/digest"]

0 commit comments

Comments
 (0)