Skip to content
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.

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

Update dependencies and bump new version of the crate #96

Merged
merged 2 commits into from
Apr 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
rust: [1.67, stable, nightly]
rust: [1.68.2, stable, nightly]
key_feature_set:
- key_openssl_pkey
- key_kms
Expand Down
13 changes: 7 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
[package]
name = "aws-nitro-enclaves-cose"
version = "0.5.1"
version = "0.5.2"
authors = ["Petre Eftime <epetre@amazon.com>"]
edition = "2018"
license = "Apache-2.0"
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.67"
rust-version = "1.68"

[dependencies]
serde_cbor = { version="0.11", features = ["tags"] }
serde_repr = "0.1"
serde_bytes = { version = "0.11", features = ["std"] }
serde_with = { version = "3.3" }
openssl = { version = "0.10", optional = true }
tss-esapi = { version = "7.4", optional = true }
aws-config = { version = "0.56", optional = true }
aws-sdk-kms = { version = "0.31", optional = true }
tss-esapi = { version = "7.5.1", optional = true }
aws-sdk-kms = { version = "<=1.20", optional = true }
tokio = { version = "1.20", features = ["rt", "macros"], optional = true }

[dependencies.serde]
Expand All @@ -27,9 +26,11 @@ features = ["derive"]

[dev-dependencies]
hex = "0.4"
aws-config = { version = "<=1.1" }
aws-smithy-runtime = { version = "<=1.2" }

[features]
default = ["key_openssl_pkey"]
key_openssl_pkey = ["openssl"]
key_tpm = ["tss-esapi", "openssl"]
key_kms = ["aws-config", "aws-sdk-kms", "tokio", "key_openssl_pkey"]
key_kms = ["aws-sdk-kms", "tokio", "key_openssl_pkey"]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +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.67.1-blue
[msrv]: https://img.shields.io/badge/MSRV-1.68.2-blue

## COSE for AWS Nitro Enclaves

Expand Down
9 changes: 5 additions & 4 deletions src/sign.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1312,11 +1312,12 @@ mod tests {
sign::*,
};

use aws_config::BehaviorVersion;
use std::env;

#[tokio::test]
async fn cose_sign_kms() {
let config = aws_config::from_env().load().await;
let config = aws_config::defaults(BehaviorVersion::latest()).load().await;
let kms_client = aws_sdk_kms::Client::new(&config);

tokio::task::spawn_blocking(|| {
Expand Down Expand Up @@ -1350,7 +1351,7 @@ mod tests {

#[tokio::test]
async fn cose_sign_kms_invalid_signature() {
let config = aws_config::from_env().load().await;
let config = aws_config::defaults(BehaviorVersion::latest()).load().await;
let kms_client = aws_sdk_kms::Client::new(&config);

tokio::task::spawn_blocking(|| {
Expand Down Expand Up @@ -1388,7 +1389,7 @@ mod tests {
#[cfg(feature = "key_openssl_pkey")]
#[tokio::test]
async fn cose_sign_kms_public_key() {
let config = aws_config::from_env().load().await;
let config = aws_config::defaults(BehaviorVersion::latest()).load().await;
let kms_client = aws_sdk_kms::Client::new(&config);

let key_id = env::var("AWS_KMS_TEST_KEY_ARN").expect("Please set AWS_KMS_TEST_KEY_ARN");
Expand Down Expand Up @@ -1418,7 +1419,7 @@ mod tests {
#[cfg(feature = "key_openssl_pkey")]
#[tokio::test]
async fn cose_sign_kms_public_key_invalid_signature() {
let config = aws_config::from_env().load().await;
let config = aws_config::defaults(BehaviorVersion::latest()).load().await;
let kms_client = aws_sdk_kms::Client::new(&config);

let key_id = env::var("AWS_KMS_TEST_KEY_ARN").expect("Please set AWS_KMS_TEST_KEY_ARN");
Expand Down