diff --git a/.github/workflows/ring-compat.yml b/.github/workflows/ring-compat.yml index dd90d4e..05fbe43 100644 --- a/.github/workflows/ring-compat.yml +++ b/.github/workflows/ring-compat.yml @@ -19,7 +19,7 @@ jobs: strategy: matrix: rust: - - 1.57.0 # MSRV + - 1.60.0 # MSRV - stable steps: - uses: actions/checkout@v3 diff --git a/Cargo.lock b/Cargo.lock index 97d5f98..f2f6cc8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -298,6 +298,7 @@ dependencies = [ "p256", "p384", "ring", + "signature", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index d94a681..af093e2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ repository = "https://github.com/RustCrypto/ring-compat" categories = ["cryptography", "no-std"] keywords = ["aead", "digest", "crypto", "ring", "signature"] edition = "2021" -rust-version = "1.57" +rust-version = "1.60" [dependencies] generic-array = { version = "0.14", default-features = false } @@ -27,6 +27,7 @@ ecdsa = { version = "0.14", optional = true, default-features = false } ed25519 = { version = "1.4", optional = true, default-features = false } p256 = { version = "0.11", optional = true, default-features = false, features = ["ecdsa-core"] } p384 = { version = "0.11", optional = true, default-features = false, features = ["ecdsa-core"] } +signature = { version = "1", optional = true, default-features = false } [dev-dependencies] hex-literal = "0.3" @@ -34,9 +35,9 @@ digest = { version = "0.10", features = ["dev"] } [features] default = ["aead", "alloc", "digest", "signature"] -alloc = ["aead/alloc"] -signature = ["ecdsa", "ed25519", "p256", "p384"] -std = ["digest/std", "ecdsa/std", "ed25519/std"] +alloc = ["aead?/alloc"] +signature = ["dep:ecdsa", "dep:ed25519", "dep:p256", "dep:p384", "dep:signature"] +std = ["digest?/std", "ecdsa?/std", "ed25519?/std"] [package.metadata.docs.rs] all-features = true diff --git a/README.md b/README.md index 13591ef..396b734 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ algorithm implementations from [*ring*]. ## Minimum Supported Rust Version -**Rust 1.57** or higher. +**Rust 1.60** or higher. In the future the minimum supported Rust version can be changed, but it will be done with a minor version bump. @@ -43,7 +43,7 @@ dual licensed as above, without any additional terms or conditions. [docs-link]: https://docs.rs/ring-compat/ [docs-link]: https://docs.rs/ring-compat [ring-image]: https://img.shields.io/badge/ring-0.16-blue.svg -[rustc-image]: https://img.shields.io/badge/rustc-1.57+-blue.svg +[rustc-image]: https://img.shields.io/badge/rustc-1.60+-blue.svg [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg [chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg [chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/260488-ring-compat diff --git a/src/signature.rs b/src/signature.rs index d60f19e..f04c4b1 100644 --- a/src/signature.rs +++ b/src/signature.rs @@ -3,4 +3,4 @@ pub mod ecdsa; pub mod ed25519; -pub use ::ecdsa::signature::{Error, Signature, Signer, Verifier}; +pub use ::signature::{Error, Signature, Signer, Verifier};