Skip to content

Commit

Permalink
Merge pull request #696 from aws/ajewell/rust-smithy-update
Browse files Browse the repository at this point in the history
chore: update for latest MPL and smithy-dafny
  • Loading branch information
ajewellamz authored Nov 15, 2024
2 parents a4935a6 + a2557bd commit 63256e3
Show file tree
Hide file tree
Showing 56 changed files with 230 additions and 22,002 deletions.
33 changes: 25 additions & 8 deletions AwsEncryptionSDK/runtimes/rust/.gitignore
Original file line number Diff line number Diff line change
@@ -1,18 +1,35 @@
target
*.pem
Cargo.lock
src/implementation_from_dafny.rs
client.rs
src/client/
conversions.rs
src/conversions/
deps.rs
src/deps/
error.rs
src/error/
operation.rs
src/aes_gcm.rs
src/client/
src/concurrent_call.rs
src/conversions/
src/dafny_libraries.rs
src/ddb.rs
src/deps/
src/digest.rs
src/ecdh.rs
src/ecdsa.rs
src/error/
src/hmac.rs
src/implementation_from_dafny.rs
src/kms.rs
src/local_cmc.rs
src/operation/
src/random.rs
src/rsa.rs
src/sets.rs
src/software_externs.rs
src/storm_tracker.rs
src/time.rs
src/types/
src/uuid.rs
standard_library_conversions.rs
standard_library_externs.rs
target
types.rs
src/types/
*.pem
5 changes: 1 addition & 4 deletions AwsEncryptionSDK/runtimes/rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,12 @@ aws-sdk-kms = "1.48.0"
aws-smithy-runtime-api = {version = "1.7.2", features = ["client"] }
aws-smithy-types = "1.2.8"
chrono = "0.4.38"
dafny_runtime = { path = "dafny_runtime_rust"}
dafny_runtime = { path = "../../../mpl/smithy-dafny/TestModels/dafny-dependencies/dafny_runtime_rust"}
dashmap = "6.1.0"
pem = "3.0.4"
rand = "0.8.5"
tokio = {version = "1.41.0", features = ["full"] }
uuid = { version = "1.11.0", features = ["v4"] }

[lib]
path = "src/implementation_from_dafny.rs"

[[example]]
name = "main"
25 changes: 25 additions & 0 deletions AwsEncryptionSDK/runtimes/rust/copy_externs.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/bash -eu

cd $( dirname ${BASH_SOURCE[0]} )

SRC=../../../mpl/AwsCryptographicMaterialProviders/runtimes/rust/src/

cp $SRC/aes_gcm.rs src
# MPL needs update to add 'allow dead code'
# cp $SRC/aes_kdf_ctr.rs src
cp $SRC/concurrent_call.rs src
cp $SRC/dafny_libraries.rs src
cp $SRC/ddb.rs src
cp $SRC/digest.rs src
cp $SRC/ecdh.rs src
cp $SRC/ecdsa.rs src
cp $SRC/hmac.rs src
cp $SRC/kms.rs src
cp $SRC/local_cmc.rs src
cp $SRC/random.rs src
cp $SRC/rsa.rs src
cp $SRC/sets.rs src
cp $SRC/software_externs.rs src
cp $SRC/storm_tracker.rs src
cp $SRC/time.rs src
cp $SRC/uuid.rs src
9 changes: 0 additions & 9 deletions AwsEncryptionSDK/runtimes/rust/dafny_runtime_rust/Cargo.toml

This file was deleted.

22 changes: 0 additions & 22 deletions AwsEncryptionSDK/runtimes/rust/dafny_runtime_rust/Makefile

This file was deleted.

Loading

0 comments on commit 63256e3

Please sign in to comment.