From 8e1c19cb55d167baec1d0713c5e5b088fbf2c2db Mon Sep 17 00:00:00 2001 From: Tony Arcieri Date: Sat, 10 Dec 2022 18:18:56 -0700 Subject: [PATCH] Bump `p256` and `p384` to v0.11; MSRV 1.57 (#95) --- .github/workflows/ring-compat.yml | 4 +-- Cargo.lock | 50 +++++++++++++++---------------- Cargo.toml | 8 ++--- README.md | 4 +-- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/.github/workflows/ring-compat.yml b/.github/workflows/ring-compat.yml index 814e3c9..27b2c76 100644 --- a/.github/workflows/ring-compat.yml +++ b/.github/workflows/ring-compat.yml @@ -19,7 +19,7 @@ jobs: strategy: matrix: rust: - - 1.56.0 # MSRV + - 1.57.0 # MSRV - stable steps: - uses: actions/checkout@v3 @@ -57,7 +57,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: profile: minimal - toolchain: 1.56.0 # MSRV + toolchain: 1.57.0 # MSRV components: clippy override: true - run: cargo clippy --all --all-features -- -D warnings diff --git a/Cargo.lock b/Cargo.lock index 9774238..97d5f98 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -59,15 +59,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "const-oid" -version = "0.7.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" +checksum = "cec318a675afcb6a1ea1d4340e2d377e56e47c266f28043ceccbf4412ddfdd3b" [[package]] name = "crypto-bigint" -version = "0.3.2" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03c6a1d5fa1de37e071642dfa44ec552ca5b299adb128fab16138e24b548fd21" +checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" dependencies = [ "generic-array", "rand_core", @@ -87,11 +87,12 @@ dependencies = [ [[package]] name = "der" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6919815d73839e7ad218de758883aae3a257ba6759ce7a9992501efbb53d705c" +checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" dependencies = [ "const-oid", + "zeroize", ] [[package]] @@ -107,9 +108,9 @@ dependencies = [ [[package]] name = "ecdsa" -version = "0.13.4" +version = "0.14.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0d69ae62e0ce582d56380743515fefaf1a8c70cec685d9677636d7e30ae9dc9" +checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" dependencies = [ "der", "elliptic-curve", @@ -127,13 +128,14 @@ dependencies = [ [[package]] name = "elliptic-curve" -version = "0.11.12" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25b477563c2bfed38a3b7a60964c49e058b2510ad3f12ba3483fd8f62c2306d6" +checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" dependencies = [ "base16ct", "crypto-bigint", "der", + "digest", "generic-array", "rand_core", "sec1", @@ -212,35 +214,32 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "p256" -version = "0.10.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19736d80675fbe9fe33426268150b951a3fb8f5cfca2a23a17c85ef3adb24e3b" +checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" dependencies = [ "ecdsa", "elliptic-curve", - "sec1", ] [[package]] name = "p384" -version = "0.9.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "755d8266e41f57bd8562ed9b6e93cdcf73ead050e1e8c3a27ea3871b6643a20c" +checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" dependencies = [ "ecdsa", "elliptic-curve", - "sec1", ] [[package]] name = "pkcs8" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cabda3fb821068a9a4fab19a683eac3af12edf0f34b94a8be53c4972b8149d0" +checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" dependencies = [ "der", "spki", - "zeroize", ] [[package]] @@ -303,10 +302,11 @@ dependencies = [ [[package]] name = "sec1" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08da66b8b0965a5555b6bd6639e68ccba85e1e2506f5fbb089e93f8a04e1a2d1" +checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" dependencies = [ + "base16ct", "der", "generic-array", "pkcs8", @@ -316,9 +316,9 @@ dependencies = [ [[package]] name = "signature" -version = "1.4.0" +version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788" +checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" dependencies = [ "rand_core", ] @@ -331,9 +331,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "spki" -version = "0.5.4" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d01ac02a6ccf3e07db148d2be087da624fea0221a16152ed01f0496a6b0a27" +checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" dependencies = [ "base64ct", "der", diff --git a/Cargo.toml b/Cargo.toml index f4293fd..d94a681 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.56" +rust-version = "1.57" [dependencies] generic-array = { version = "0.14", default-features = false } @@ -23,10 +23,10 @@ ring = { version = "0.16", default-features = false } # optional features aead = { version = "0.5", optional = true, default-features = false } digest = { version = "0.10", optional = true } -ecdsa = { version = "0.13", optional = true, default-features = false } +ecdsa = { version = "0.14", optional = true, default-features = false } ed25519 = { version = "1.4", optional = true, default-features = false } -p256 = { version = "0.10", optional = true, default-features = false, features = ["ecdsa-core"] } -p384 = { version = "0.9", optional = true, default-features = false, features = ["ecdsa"] } +p256 = { version = "0.11", optional = true, default-features = false, features = ["ecdsa-core"] } +p384 = { version = "0.11", optional = true, default-features = false, features = ["ecdsa-core"] } [dev-dependencies] hex-literal = "0.3" diff --git a/README.md b/README.md index cd00685..13591ef 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ algorithm implementations from [*ring*]. ## Minimum Supported Rust Version -**Rust 1.56** or higher. +**Rust 1.57** 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.56+-blue.svg +[rustc-image]: https://img.shields.io/badge/rustc-1.57+-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