diff --git a/.github/workflows/library_rust_tests.yml b/.github/workflows/library_rust_tests.yml index cda7016bd..bb298fe5a 100644 --- a/.github/workflows/library_rust_tests.yml +++ b/.github/workflows/library_rust_tests.yml @@ -135,4 +135,4 @@ jobs: working-directory: ./AwsEncryptionSDK/runtimes/rust shell: bash run: | - cargo test --examples \ No newline at end of file + cargo test --release --examples \ No newline at end of file diff --git a/AwsEncryptionSDK/runtimes/rust/examples/client_supplier/mod.rs b/AwsEncryptionSDK/runtimes/rust/examples/client_supplier/mod.rs index 3f2c50ba9..7b31bc5e5 100644 --- a/AwsEncryptionSDK/runtimes/rust/examples/client_supplier/mod.rs +++ b/AwsEncryptionSDK/runtimes/rust/examples/client_supplier/mod.rs @@ -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; diff --git a/AwsEncryptionSDK/runtimes/rust/examples/client_supplier/regional_role_client_supplier.rs b/AwsEncryptionSDK/runtimes/rust/examples/client_supplier/regional_role_client_supplier.rs index a04ce5a2a..0a6b31a1a 100644 --- a/AwsEncryptionSDK/runtimes/rust/examples/client_supplier/regional_role_client_supplier.rs +++ b/AwsEncryptionSDK/runtimes/rust/examples/client_supplier/regional_role_client_supplier.rs @@ -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; diff --git a/AwsEncryptionSDK/runtimes/rust/examples/client_supplier/regional_role_client_supplier_config.rs b/AwsEncryptionSDK/runtimes/rust/examples/client_supplier/regional_role_client_supplier_config.rs index cc4d9ec9b..063858975 100644 --- a/AwsEncryptionSDK/runtimes/rust/examples/client_supplier/regional_role_client_supplier_config.rs +++ b/AwsEncryptionSDK/runtimes/rust/examples/client_supplier/regional_role_client_supplier_config.rs @@ -1,3 +1,6 @@ +// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: Apache-2.0 + use std::collections::HashMap; /* diff --git a/AwsEncryptionSDK/runtimes/rust/examples/cryptographic_materials_manager/mod.rs b/AwsEncryptionSDK/runtimes/rust/examples/cryptographic_materials_manager/mod.rs index 3c640f858..92bdd4bb7 100644 --- a/AwsEncryptionSDK/runtimes/rust/examples/cryptographic_materials_manager/mod.rs +++ b/AwsEncryptionSDK/runtimes/rust/examples/cryptographic_materials_manager/mod.rs @@ -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; \ No newline at end of file +pub mod restrict_algorithm_suite; diff --git a/AwsEncryptionSDK/runtimes/rust/examples/cryptographic_materials_manager/required_encryption_context/mod.rs b/AwsEncryptionSDK/runtimes/rust/examples/cryptographic_materials_manager/required_encryption_context/mod.rs index f1b2fe755..5680f476f 100644 --- a/AwsEncryptionSDK/runtimes/rust/examples/cryptographic_materials_manager/required_encryption_context/mod.rs +++ b/AwsEncryptionSDK/runtimes/rust/examples/cryptographic_materials_manager/required_encryption_context/mod.rs @@ -1 +1,4 @@ -pub mod required_encryption_context_example; \ No newline at end of file +// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: Apache-2.0 + +pub mod required_encryption_context_example; diff --git a/AwsEncryptionSDK/runtimes/rust/examples/cryptographic_materials_manager/restrict_algorithm_suite/mod.rs b/AwsEncryptionSDK/runtimes/rust/examples/cryptographic_materials_manager/restrict_algorithm_suite/mod.rs index dd135d17a..e96c8808b 100644 --- a/AwsEncryptionSDK/runtimes/rust/examples/cryptographic_materials_manager/restrict_algorithm_suite/mod.rs +++ b/AwsEncryptionSDK/runtimes/rust/examples/cryptographic_materials_manager/restrict_algorithm_suite/mod.rs @@ -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; \ No newline at end of file +pub mod signing_suite_only_cmm; diff --git a/AwsEncryptionSDK/runtimes/rust/examples/example_utils/mod.rs b/AwsEncryptionSDK/runtimes/rust/examples/example_utils/mod.rs index fab870e3e..14a38ea07 100644 --- a/AwsEncryptionSDK/runtimes/rust/examples/example_utils/mod.rs +++ b/AwsEncryptionSDK/runtimes/rust/examples/example_utils/mod.rs @@ -1 +1,4 @@ -pub mod utils; \ No newline at end of file +// Copyright Amazon.com Inc. or its affiliates. All Rights Reserved. +// SPDX-License-Identifier: Apache-2.0 + +pub mod utils; diff --git a/AwsEncryptionSDK/runtimes/rust/examples/keyring/aws_kms_hierarchical/mod.rs b/AwsEncryptionSDK/runtimes/rust/examples/keyring/aws_kms_hierarchical/mod.rs index ba1be1164..77beff84b 100644 --- a/AwsEncryptionSDK/runtimes/rust/examples/keyring/aws_kms_hierarchical/mod.rs +++ b/AwsEncryptionSDK/runtimes/rust/examples/keyring/aws_kms_hierarchical/mod.rs @@ -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; diff --git a/AwsEncryptionSDK/runtimes/rust/examples/keyring/ecdh/mod.rs b/AwsEncryptionSDK/runtimes/rust/examples/keyring/ecdh/mod.rs index 72374622a..f1d25cf89 100644 --- a/AwsEncryptionSDK/runtimes/rust/examples/keyring/ecdh/mod.rs +++ b/AwsEncryptionSDK/runtimes/rust/examples/keyring/ecdh/mod.rs @@ -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; diff --git a/AwsEncryptionSDK/runtimes/rust/examples/keyring/mod.rs b/AwsEncryptionSDK/runtimes/rust/examples/keyring/mod.rs index 6c2d33b25..a19028815 100644 --- a/AwsEncryptionSDK/runtimes/rust/examples/keyring/mod.rs +++ b/AwsEncryptionSDK/runtimes/rust/examples/keyring/mod.rs @@ -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; diff --git a/AwsEncryptionSDK/runtimes/rust/src/lib.rs b/AwsEncryptionSDK/runtimes/rust/src/lib.rs index 49d13a1b7..846c5cf20 100644 --- a/AwsEncryptionSDK/runtimes/rust/src/lib.rs +++ b/AwsEncryptionSDK/runtimes/rust/src/lib.rs @@ -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; diff --git a/TestVectors/runtimes/rust/src/main.rs b/TestVectors/runtimes/rust/src/main.rs index f16ff186b..48762ea1b 100644 --- a/TestVectors/runtimes/rust/src/main.rs +++ b/TestVectors/runtimes/rust/src/main.rs @@ -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 = std::env::args().collect();