chore(rust): better blocking

.github/actions/install_smithy_dafny_codegen_dependencies/action.yml

@@ -27,7 +27,7 @@ runs:
     - shell: bash
       run: |
         python -m pip install --upgrade pip
-        python -m pip install --upgrade black
+        python -m pip install black==25.1
         python -m pip install --upgrade docformatter
 
     - name: Install Go

AwsEncryptionSDK/runtimes/net/ESDK.csproj

@@ -31,15 +31,15 @@
   <ItemGroup>
       <!-- TODO: manually upgraded to match the latest from MPL, is that reasonable? -->
       <PackageReference Include="DafnyRuntime" Version="4.9.0" />
-      <PackageReference Include="BouncyCastle.Cryptography" Version="2.3.1" />
+      <PackageReference Include="BouncyCastle.Cryptography" Version="2.6.2" />
       <ProjectReference Include="../../../mpl/AwsCryptographicMaterialProviders/runtimes/net/MPL.csproj" />
       <!--
         System.Collections.Immutable can be removed once dafny.msbuild is updated with
         https://github.com/dafny-lang/dafny.msbuild/pull/10 and versioned
       -->
       <PackageReference Include="System.Collections.Immutable" Version="1.7.0" />
       <!-- Work around for dafny-lang/dafny/issues/1951; remove once resolved -->
-      <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+      <PackageReference Include="System.ValueTuple" Version="4.6.1" />
 
       <Compile Include="Generated/**/*.cs" />
       <Compile Include="ImplementationFromDafny.cs" />

AwsEncryptionSDK/runtimes/net/tests/Test-ESDK.csproj

@@ -17,7 +17,7 @@
       -->
       <PackageReference Include="System.Collections.Immutable" Version="1.7.0" />
       <!-- Work around for dafny-lang/dafny/issues/1951; remove once resolved -->
-      <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+      <PackageReference Include="System.ValueTuple" Version="4.6.1" />
     </ItemGroup>
 
     <ItemGroup>

AwsEncryptionSDK/runtimes/rust/Cargo.toml

@@ -2,7 +2,6 @@
 name = "aws-esdk"
 version = "1.2.1"
 edition = "2021"
-rust-version = "1.88.0"
 keywords = ["cryptography", "security", "dynamodb", "encryption", "client-side"]
 license = "ISC AND (Apache-2.0 OR ISC)"
 description = "aws-esdk is a library for implementing client side encryption."
@@ -16,22 +15,22 @@ readme = "README.md"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-aws-config = "1.8.10"
-aws-lc-rs = {version = "1.15.0"}
-aws-lc-sys = { version = "0.36", optional = true }
+aws-config = "1.8.12"
+aws-lc-rs = {version = "1.15.4"}
+aws-lc-sys = { version = "0.37", optional = true }
 aws-lc-fips-sys = { version = "0.13", optional = true }
-aws-sdk-dynamodb = "1.98.0"
-aws-sdk-kms = "1.94.0"
-aws-smithy-runtime-api = {version = "1.9.2", features = ["client"] }
-aws-smithy-types = "1.3.4"
-chrono = "0.4.42"
+aws-sdk-dynamodb = "1.103.0"
+aws-sdk-kms = "1.98.0"
+aws-smithy-runtime-api = {version = "1.10.0", features = ["client"] }
+aws-smithy-types = "1.3.6"
+chrono = "0.4.43"
 cpu-time = "1.0.0"
 dafny_runtime = { path = "../../../mpl/smithy-dafny/TestModels/dafny-dependencies/dafny_runtime_rust", features = ["sync","small-int"]}
 dashmap = "6.1.0"
 pem = "3.0.6"
 rand = "0.9.2"
-tokio = {version = "1.48.0", features = ["full"] }
-uuid = { version = "1.18.1", features = ["v4"] }
+tokio = {version = "1.49.0", features = ["full"] }
+uuid = { version = "1.19.0", features = ["v4"] }
 
 [[example]]
 name = "main"

AwsEncryptionSDK/runtimes/rust/copy_externs.sh

@@ -12,6 +12,7 @@ cp $SRC/ddb.rs src
 cp $SRC/digest.rs src
 cp $SRC/ecdh.rs src
 cp $SRC/ecdsa.rs src
+cp $SRC/escape.rs src
 cp $SRC/hmac.rs src
 cp $SRC/kms.rs src
 cp $SRC/local_cmc.rs src

AwsEncryptionSDK/runtimes/rust/examples/keyring/aws_kms_keyring_example.rs

@@ -108,7 +108,7 @@ pub async fn encrypt_and_decrypt_with_keyring(
     Ok(())
 }
 
-#[tokio::test(flavor = "multi_thread")]
+#[tokio::test]
 pub async fn test_encrypt_and_decrypt_with_keyring() -> Result<(), crate::BoxError2> {
     // Test function for encrypt and decrypt using the AWS KMS Keyring example
     use crate::example_utils::utils;

AwsEncryptionSDK/runtimes/rust/examples/keyring/aws_kms_mrk_multi_keyring_example.rs

@@ -163,7 +163,7 @@ pub async fn encrypt_and_decrypt_with_keyring(
     Ok(())
 }
 
-#[tokio::test(flavor = "multi_thread")]
+#[tokio::test]
 pub async fn test_encrypt_and_decrypt_with_keyring() -> Result<(), crate::BoxError2> {
     // Test function for encrypt and decrypt using the AWS KMS MRK Multi Keyring example
     use crate::example_utils::utils;

AwsEncryptionSDK/runtimes/rust/src/lib.rs

@@ -112,6 +112,7 @@ 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(crate) use crate::deps::com_amazonaws_kms::client::Client as KmsClient;
+pub(crate) use crate::deps::com_amazonaws_dynamodb::client::Client as DdbClient;
 
 // Import smithy-generated modules
 pub(crate) mod conversions;
@@ -127,6 +128,7 @@ pub(crate) mod ddb;
 pub(crate) mod digest;
 pub(crate) mod ecdh;
 pub(crate) mod ecdsa;
+pub(crate) mod escape;
 pub(crate) mod hmac;
 pub(crate) mod kms;
 pub(crate) mod local_cmc;

TestVectors/runtimes/net/ESDKTestVectors.csproj

@@ -17,7 +17,7 @@
         -->
         <PackageReference Include="System.Collections.Immutable" Version="1.7.0" />
         <!-- Work around for dafny-lang/dafny/issues/1951; remove once resolved -->
-        <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+        <PackageReference Include="System.ValueTuple" Version="4.6.1" />
 
         <Compile Include="Extern/**/*.cs" />
         <Compile Include="Generated/**/*.cs" />

TestVectors/runtimes/net/tests/TestVectors-Tests.csproj

@@ -17,7 +17,7 @@
       -->
       <PackageReference Include="System.Collections.Immutable" Version="1.7.0" />
       <!-- Work around for dafny-lang/dafny/issues/1951; remove once resolved -->
-      <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+      <PackageReference Include="System.ValueTuple" Version="4.6.1" />
     </ItemGroup>
 
     <ItemGroup>

TestVectors/runtimes/rust/Cargo.toml

@@ -2,7 +2,6 @@
 name = "aws-esdk-test-vectors"
 version = "0.1.0"
 edition = "2021"
-rust-version = "1.86.0"
 description = "aws-esdk-test-vectors is a library for testing aws-esdk."
 authors = ["AWS-CryptoTools"]
 autoexamples = false
@@ -11,22 +10,22 @@ readme = "README.md"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-aws-config = "1.8.5"
-aws-lc-rs = {version = "1.13.3"}
-aws-lc-sys = { version = "0.30", optional = true }
+aws-config = "1.8.12"
+aws-lc-rs = {version = "1.15.4"}
+aws-lc-sys = { version = "0.37", optional = true }
 aws-lc-fips-sys = { version = "0.13", optional = true }
-aws-sdk-dynamodb = "1.90.0"
-aws-sdk-kms = "1.84.0"
-aws-smithy-runtime-api = {version = "1.9.0", features = ["client"] }
-aws-smithy-types = "1.3.2"
-chrono = "0.4.41"
+aws-sdk-dynamodb = "1.103.0"
+aws-sdk-kms = "1.98.0"
+aws-smithy-runtime-api = {version = "1.10.0", features = ["client"] }
+aws-smithy-types = "1.3.6"
+chrono = "0.4.43"
 cpu-time = "1.0.0"
 dafny_runtime = { path = "../../../mpl/smithy-dafny/TestModels/dafny-dependencies/dafny_runtime_rust", features = ["sync","small-int"]}
 dashmap = "6.1.0"
-pem = "3.0.5"
+pem = "3.0.6"
 rand = "0.9.2"
-tokio = {version = "1.47.1", features = ["full"] }
-uuid = { version = "1.18.0", features = ["v4"] }
+tokio = {version = "1.49.0", features = ["full"] }
+uuid = { version = "1.19.0", features = ["v4"] }
 ring = "=0.17.14"
 
 [dev-dependencies]

TestVectors/runtimes/rust/copy_externs.sh

@@ -12,6 +12,7 @@ cp $SRC/ddb.rs src
 cp $SRC/digest.rs src
 cp $SRC/ecdh.rs src
 cp $SRC/ecdsa.rs src
+cp $SRC/escape.rs src
 cp $SRC/hmac.rs src
 cp $SRC/kms.rs src
 cp $SRC/local_cmc.rs src

TestVectors/runtimes/rust/src/main.rs

@@ -52,6 +52,7 @@ 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(crate) use crate::deps::com_amazonaws_kms::client::Client as KmsClient;
+pub(crate) use crate::deps::com_amazonaws_dynamodb::client::Client as DdbClient;
 
 pub(crate) mod aes_gcm;
 pub(crate) mod aes_kdf_ctr;
@@ -61,6 +62,7 @@ pub(crate) mod ddb;
 pub(crate) mod digest;
 pub(crate) mod ecdh;
 pub(crate) mod ecdsa;
+pub(crate) mod escape;
 pub(crate) mod hmac;
 pub(crate) mod kms;
 pub(crate) mod local_cmc;

esdk-performance-testing/benchmarks/rust/Cargo.toml

@@ -13,7 +13,7 @@ path = "src/main.rs"
 aws-esdk = { path = "../../../AwsEncryptionSDK/runtimes/rust" }
 
 # Async runtime
-tokio = { version = "1.47", features = ["full"] }
+tokio = { version = "1.49", features = ["full"] }
 
 # Serialization
 serde = { version = "1.0", features = ["derive"] }
@@ -49,14 +49,14 @@ stats_alloc = "0.1"
 # Async utilities
 futures = "0.3"
 
-aws-config = "1.8.6"
-aws-sdk-dynamodb = "1.92.0"
-aws-sdk-kms = "1.86.0"
-aws-sdk-sso = "1.83.0"
-aws-sdk-ssooidc = "1.84.0"
-aws-sdk-sts = "1.85.0"
+aws-config = "1.8.12"
+aws-sdk-dynamodb = "1.103.0"
+aws-sdk-kms = "1.98.0"
+aws-sdk-sso = "1.92.0"
+aws-sdk-ssooidc = "1.94.0"
+aws-sdk-sts = "1.96.0"
 aws-smithy-types = "1.3"
 cpu-time = "1.0.0"
 
 [dev-dependencies]
-criterion = { version = "0.7", features = ["html_reports"] }
+criterion = { version = "0.8", features = ["html_reports"] }