diff --git a/AwsEncryptionSDK/Makefile b/AwsEncryptionSDK/Makefile index 9f83c68a8..1421a931f 100644 --- 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 index e0c923a7d..23eefd366 100644 --- 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 index 98ebc0052..25f854091 100755 --- 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 index 53d53c28a..26127a149 100644 --- 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 index a96f7d090..6dade7a48 100644 --- 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 index e9aecbc0a..98dcbf80a 100644 --- 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 index 98ebc0052..25f854091 100755 --- 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 index 5e2e3ffbf..933131ee3 100644 --- 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 index 59979192a..1915a11bb 160000 --- a/mpl +++ b/mpl @@ -1 +1 @@ -Subproject commit 59979192a51ef5b1864ac36d57925d55eb562fa2 +Subproject commit 1915a11bb84d3d9135b89d2a46ec9d6dff27b493