Merge pull request #727 from aws/ajewell/update-mpl

chore: update mpl
aws · Dec 20, 2024 · 735f08c · 735f08c
2 parents a5282af + 95fe4e9
commit 735f08c
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 1 deletion.
diff --git a/AwsEncryptionSDK/Makefile b/AwsEncryptionSDK/Makefile
@@ -25,6 +25,7 @@ RUST_OTHER_FILES := \
 	runtimes/rust/src/hmac.rs \
 	runtimes/rust/src/kms.rs \
 	runtimes/rust/src/local_cmc.rs \
+	runtimes/rust/src/oslang.rs \
 	runtimes/rust/src/random.rs \
 	runtimes/rust/src/rsa.rs \
 	runtimes/rust/src/sets.rs \

diff --git a/AwsEncryptionSDK/runtimes/rust/.gitignore b/AwsEncryptionSDK/runtimes/rust/.gitignore
@@ -22,6 +22,7 @@ src/implementation_from_dafny.rs
 src/kms.rs
 src/local_cmc.rs
 src/operation/
+src/oslang.rs
 src/random.rs
 src/rsa.rs
 src/sets.rs

diff --git a/AwsEncryptionSDK/runtimes/rust/copy_externs.sh b/AwsEncryptionSDK/runtimes/rust/copy_externs.sh
@@ -15,6 +15,7 @@ cp $SRC/ecdsa.rs src
 cp $SRC/hmac.rs src
 cp $SRC/kms.rs src
 cp $SRC/local_cmc.rs src
+cp $SRC/oslang.rs src
 cp $SRC/random.rs src
 cp $SRC/rsa.rs src
 cp $SRC/sets.rs src

diff --git a/AwsEncryptionSDK/runtimes/rust/src/lib.rs b/AwsEncryptionSDK/runtimes/rust/src/lib.rs
@@ -126,6 +126,7 @@ pub(crate) mod ecdsa;
 pub(crate) mod hmac;
 pub(crate) mod kms;
 pub(crate) mod local_cmc;
+pub(crate) mod oslang;
 pub(crate) mod random;
 pub(crate) mod rsa;
 pub(crate) mod sets;

diff --git a/TestVectors/Makefile b/TestVectors/Makefile
@@ -26,6 +26,7 @@ RUST_OTHER_FILES := \
 	runtimes/rust/src/hmac.rs \
 	runtimes/rust/src/kms.rs \
 	runtimes/rust/src/local_cmc.rs \
+	runtimes/rust/src/oslang.rs \
 	runtimes/rust/src/random.rs \
 	runtimes/rust/src/rsa.rs \
 	runtimes/rust/src/sets.rs \

diff --git a/TestVectors/runtimes/rust/.gitignore b/TestVectors/runtimes/rust/.gitignore
@@ -21,6 +21,7 @@ src/kms.rs
 src/local_cmc.rs
 src/operation.rs
 src/operation/
+src/oslang.rs
 src/random.rs
 src/rsa.rs
 src/sets.rs

diff --git a/TestVectors/runtimes/rust/copy_externs.sh b/TestVectors/runtimes/rust/copy_externs.sh
@@ -15,6 +15,7 @@ cp $SRC/ecdsa.rs src
 cp $SRC/hmac.rs src
 cp $SRC/kms.rs src
 cp $SRC/local_cmc.rs src
+cp $SRC/oslang.rs src
 cp $SRC/random.rs src
 cp $SRC/rsa.rs src
 cp $SRC/sets.rs src

diff --git a/TestVectors/runtimes/rust/src/main.rs b/TestVectors/runtimes/rust/src/main.rs
@@ -57,6 +57,7 @@ pub(crate) mod ecdsa;
 pub(crate) mod hmac;
 pub(crate) mod kms;
 pub(crate) mod local_cmc;
+pub(crate) mod oslang;
 pub(crate) mod random;
 pub(crate) mod rsa;
 pub(crate) mod sets;

diff --git a/mpl b/mpl