Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/library_rust_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -135,4 +135,4 @@ jobs:
working-directory: ./AwsEncryptionSDK/runtimes/rust
shell: bash
run: |
cargo test --examples
cargo test --release --examples
20 changes: 10 additions & 10 deletions AwsEncryptionSDK/runtimes/rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "aws-esdk"
version = "0.1.0"
edition = "2021"
rust-version = "1.80.0"
keywords = ["crypto", "cryptography", "security", "dynamodb", "ddb", "encryption", "client-side", "clientside"]
keywords = ["cryptography", "security", "dynamodb", "ddb", "encryption", "client-side"]
license = "ISC AND (Apache-2.0 OR ISC)"
description = "aws-esdk is a library for implementing client side encryption."
homepage = "https://github.com/aws/aws-encryption-sdk-dafny"
Expand All @@ -16,19 +16,19 @@ readme = "README.md"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
aws-config = "1.5.9"
aws-lc-rs = "1.10.0"
aws-lc-sys = "0.22.0"
aws-sdk-dynamodb = "1.51.0"
aws-sdk-kms = "1.48.0"
aws-smithy-runtime-api = {version = "1.7.2", features = ["client"] }
aws-smithy-types = "1.2.8"
aws-config = "1.5.10"
aws-lc-rs = "1.11.1"
aws-lc-sys = "0.23.1"
aws-sdk-dynamodb = "1.55.0"
aws-sdk-kms = "1.51.0"
aws-smithy-runtime-api = {version = "1.7.3", features = ["client"] }
aws-smithy-types = "1.2.9"
chrono = "0.4.38"
dafny_runtime = { path = "../../../mpl/smithy-dafny/TestModels/dafny-dependencies/dafny_runtime_rust"}
dafny-runtime = "0.1.1"
dashmap = "6.1.0"
pem = "3.0.4"
rand = "0.8.5"
tokio = {version = "1.41.0", features = ["full"] }
tokio = {version = "1.42.0", features = ["full"] }
uuid = { version = "1.11.0", features = ["v4"] }

[[example]]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

pub mod client_supplier_example;
pub mod regional_role_client_supplier;
pub mod regional_role_client_supplier_config;
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

use aws_config::Region;
use aws_esdk::aws_cryptography_materialProviders::types::ClientSupplier;
use aws_esdk::aws_cryptography_materialProviders::operation::get_client::GetClientInput;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

use std::collections::HashMap;

/*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

pub mod required_encryption_context;
pub mod restrict_algorithm_suite;
pub mod restrict_algorithm_suite;
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
pub mod required_encryption_context_example;
// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

pub mod required_encryption_context_example;
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

pub mod signing_only_example;
pub mod signing_suite_only_cmm;
pub mod signing_suite_only_cmm;
5 changes: 4 additions & 1 deletion AwsEncryptionSDK/runtimes/rust/examples/example_utils/mod.rs
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
pub mod utils;
// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

pub mod utils;
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

pub mod aws_kms_hierarchical_keyring_example;
pub mod create_branch_key_id;
pub mod example_branch_key_id_supplier;
Expand Down
3 changes: 3 additions & 0 deletions AwsEncryptionSDK/runtimes/rust/examples/keyring/ecdh/mod.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

pub mod raw_ecdh_keyring_example;
pub mod ephemeral_raw_ecdh_keyring_example;
pub mod public_key_discovery_raw_ecdh_keyring_example;
Expand Down
3 changes: 3 additions & 0 deletions AwsEncryptionSDK/runtimes/rust/examples/keyring/mod.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0

pub mod aws_kms_discovery_keyring_example;
pub mod aws_kms_discovery_multi_keyring_example;
pub mod aws_kms_keyring_example;
Expand Down
36 changes: 18 additions & 18 deletions AwsEncryptionSDK/runtimes/rust/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,21 @@ pub(crate) use crate::implementation_from_dafny::HMAC;
pub(crate) use crate::implementation_from_dafny::UTF8;
pub(crate) use crate::implementation_from_dafny::UUID;

pub mod aes_gcm;
pub mod aes_kdf_ctr;
pub mod concurrent_call;
pub mod dafny_libraries;
pub mod ddb;
pub mod digest;
pub mod ecdh;
pub mod ecdsa;
pub mod hmac;
pub mod kms;
pub mod local_cmc;
pub mod random;
pub mod rsa;
pub mod sets;
pub mod software_externs;
pub mod storm_tracker;
pub mod time;
pub mod uuid;
pub(crate) mod aes_gcm;
pub(crate) mod aes_kdf_ctr;
pub(crate) mod concurrent_call;
pub(crate) mod dafny_libraries;
pub(crate) mod ddb;
pub(crate) mod digest;
pub(crate) mod ecdh;
pub(crate) mod ecdsa;
pub(crate) mod hmac;
pub(crate) mod kms;
pub(crate) mod local_cmc;
pub(crate) mod random;
pub(crate) mod rsa;
pub(crate) mod sets;
pub(crate) mod software_externs;
pub(crate) mod storm_tracker;
pub(crate) mod time;
pub(crate) mod uuid;
17 changes: 8 additions & 9 deletions TestVectors/runtimes/rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,12 @@ name = "aws-esdk-test-vectors"
version = "0.1.0"
edition = "2021"
rust-version = "1.80.0"
keywords = ["test-vectors", "testvectors", "test vectors", "esdk test vectors", "esdk dafny test vectors", "crypto", "cryptography", "security", "encryption", "client-side", "clientside"]
keywords = ["test-vectors", "testvectors", "test vectors", "esdk test vectors", "esdk dafny test vectors", "cryptography", "security", "encryption", "client-side"]
license = "ISC AND (Apache-2.0 OR ISC)"
description = "aws-esdk-test-vectors is a library for testing aws-esdk."
homepage = "https://github.com/aws/aws-encryption-sdk-dafny"
homepage = "https://github.com/aws/aws-encryption-sdk-dafny/tree/mainline/TestVectors"
repository = "https://github.com/aws/aws-encryption-sdk-dafny"
authors = ["AWS-CryptoTools"]
documentation = "https://docs.rs/crate/aws-esdk"
autoexamples = false
readme = "README.md"

Expand All @@ -20,18 +19,18 @@ wrapped-client = []

[dependencies]
aws-config = "1.5.6"
aws-lc-rs = "1.9.0"
aws-lc-sys = "0.21.2"
aws-sdk-dynamodb = "1.47.0"
aws-sdk-kms = "1.44.0"
aws-lc-rs = "1.11.1"
aws-lc-sys = "0.23.1"
aws-sdk-dynamodb = "1.55.0"
aws-sdk-kms = "1.51.0"
aws-smithy-runtime-api = {version = "1.7.2", features = ["client"] }
aws-smithy-types = "1.2.6"
chrono = "0.4.38"
dafny_runtime = { path = "../../../mpl/smithy-dafny/TestModels/dafny-dependencies/dafny_runtime_rust"}
dafny-runtime = "0.1.1"
dashmap = "6.1.0"
pem = "3.0.4"
rand = "0.8.5"
tokio = {version = "1.40.0", features = ["full"] }
tokio = {version = "1.42.0", features = ["full"] }
uuid = { version = "1.10.0", features = ["v4"] }

[dev-dependencies]
Expand Down
38 changes: 19 additions & 19 deletions TestVectors/runtimes/rust/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,25 +42,25 @@ pub(crate) use crate::implementation_from_dafny::UTF8;
pub(crate) use crate::implementation_from_dafny::UUID;
pub(crate) use crate::implementation_from_dafny::_TestWrappedESDKMain_Compile;

pub mod aes_gcm;
pub mod aes_kdf_ctr;
pub mod concurrent_call;
pub mod dafny_libraries;
pub mod ddb;
pub mod digest;
pub mod ecdh;
pub mod ecdsa;
pub mod hmac;
pub mod kms;
pub mod local_cmc;
pub mod random;
pub mod rsa;
pub mod sets;
pub mod software_externs;
pub mod storm_tracker;
pub mod time;
pub mod uuid;
pub mod test_vec_dir;
pub(crate) mod aes_gcm;
pub(crate) mod aes_kdf_ctr;
pub(crate) mod concurrent_call;
pub(crate) mod dafny_libraries;
pub(crate) mod ddb;
pub(crate) mod digest;
pub(crate) mod ecdh;
pub(crate) mod ecdsa;
pub(crate) mod hmac;
pub(crate) mod kms;
pub(crate) mod local_cmc;
pub(crate) mod random;
pub(crate) mod rsa;
pub(crate) mod sets;
pub(crate) mod software_externs;
pub(crate) mod storm_tracker;
pub(crate) mod time;
pub(crate) mod uuid;
pub(crate) mod test_vec_dir;

fn main() {
let args: Vec<String> = std::env::args().collect();
Expand Down
Loading