From e71d8f35594931a9d723ed9aaaee95e504249dca Mon Sep 17 00:00:00 2001 From: Petre Eftime Date: Fri, 5 Aug 2022 15:08:53 +0000 Subject: [PATCH] rust: set MSRV to 1.57 Due to dependencies, this bumps MSRV to 1.57. These dependencies could be kept back to some degree but I am unsure whether this would bring value. At this point, more and more libraries require version 2021, which was introduced with rust 1.56.1. Also in this commit, Cargo.toml declares the aws sdk dev dependencies as normal dependencies to not require them at all, unless building with the KMS feature. Signed-off-by: Petre Eftime --- .github/workflows/ci.yml | 2 +- Cargo.toml | 8 ++++---- README.md | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 95f835a..0d53ce0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - rust: [1.46.0, stable, nightly] + rust: [1.57.0, stable, nightly] key_feature_set: - key_openssl_pkey steps: diff --git a/Cargo.toml b/Cargo.toml index 8c15035..5022706 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,6 +8,7 @@ keywords = ["COSE"] categories = ["cryptography"] repository = "https://github.com/awslabs/aws-nitro-enclaves-cose" description = "This library aims to provide a safe Rust implementation of COSE, with COSE Sign1 currently implemented." +rust-version = "1.57" [dependencies] serde_cbor = { version="0.11", features = ["tags"] } @@ -17,7 +18,8 @@ serde_with = { version = "1.5", default_features = false } openssl = { version = "0.10", optional = true } tss-esapi = { version = "6.1", optional = true } aws-sdk-kms = { version = "0.16", optional = true } -tokio = { version = "1.20", features = ["rt"], optional = true } +tokio = { version = "1.20", features = ["rt", "macros"], optional = true } +aws-config = { version = "0.46", optional = true } [dependencies.serde] version = "1.0" @@ -25,12 +27,10 @@ features = ["derive"] [dev-dependencies] hex = "0.4" -tokio = { version = "1.20", features = ["macros"] } -aws-config = "0.46" [features] default = ["key_openssl_pkey"] key_openssl_pkey = ["openssl"] key_tpm = ["tss-esapi", "openssl"] -key_kms = ["aws-sdk-kms", "tokio", "key_openssl_pkey"] +key_kms = ["aws-sdk-kms", "aws-config", "tokio", "key_openssl_pkey"] diff --git a/README.md b/README.md index dd8425e..a23579e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![status]][actions] [![version]][crates.io] [![docs]][docs.rs] +[![status]][actions] [![version]][crates.io] [![docs]][docs.rs] ![msrv] [status]: https://img.shields.io/github/workflow/status/awslabs/aws-nitro-enclaves-cose/CI/master [actions]: https://github.com/awslabs/aws-nitro-enclaves-cose/actions?query=branch%3Amain @@ -6,6 +6,7 @@ [crates.io]: https://crates.io/crates/aws-nitro-enclaves-cose [docs]: https://img.shields.io/docsrs/aws-nitro-enclaves-cose [docs.rs]: https://docs.rs/aws-nitro-enclaves-cose +[msrv]: https://img.shields.io/badge/MSRV-1.57-blue ## COSE for AWS Nitro Enclaves