From fe03425f078bdad53401c9c602cf684ab8a8e544 Mon Sep 17 00:00:00 2001 From: Andrew Jewell <107044381+ajewellamz@users.noreply.github.com> Date: Fri, 20 Dec 2024 17:14:16 -0500 Subject: [PATCH] chore: new mpl (#1530) * chore: new mpl --- DynamoDbEncryption/Makefile | 1 + DynamoDbEncryption/runtimes/rust/.gitignore | 1 + DynamoDbEncryption/runtimes/rust/copy_externs.sh | 1 + DynamoDbEncryption/runtimes/rust/src/lib.rs | 1 + TestVectors/Makefile | 1 + TestVectors/runtimes/rust/.gitignore | 1 + TestVectors/runtimes/rust/copy_externs.sh | 1 + TestVectors/runtimes/rust/src/lib.rs | 1 + submodules/MaterialProviders | 2 +- 9 files changed, 9 insertions(+), 1 deletion(-) diff --git a/DynamoDbEncryption/Makefile b/DynamoDbEncryption/Makefile index 672aa1997..ec52ca43d 100644 --- a/DynamoDbEncryption/Makefile +++ b/DynamoDbEncryption/Makefile @@ -29,6 +29,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/DynamoDbEncryption/runtimes/rust/.gitignore b/DynamoDbEncryption/runtimes/rust/.gitignore index 143cdfc50..18aea02fa 100644 --- a/DynamoDbEncryption/runtimes/rust/.gitignore +++ b/DynamoDbEncryption/runtimes/rust/.gitignore @@ -23,6 +23,7 @@ src/local_cmc.rs src/operation src/operation.rs src/random.rs +src/oslang.rs src/rsa.rs src/sets.rs src/standard_library_conversions.rs diff --git a/DynamoDbEncryption/runtimes/rust/copy_externs.sh b/DynamoDbEncryption/runtimes/rust/copy_externs.sh index 177cf6458..2f3fceb8a 100755 --- a/DynamoDbEncryption/runtimes/rust/copy_externs.sh +++ b/DynamoDbEncryption/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/DynamoDbEncryption/runtimes/rust/src/lib.rs b/DynamoDbEncryption/runtimes/rust/src/lib.rs index a2ab0384e..06c086eec 100644 --- a/DynamoDbEncryption/runtimes/rust/src/lib.rs +++ b/DynamoDbEncryption/runtimes/rust/src/lib.rs @@ -142,6 +142,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 ecd473c25..3a4cea433 100644 --- a/TestVectors/Makefile +++ b/TestVectors/Makefile @@ -42,6 +42,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 96a010207..f832d05d4 100644 --- a/TestVectors/runtimes/rust/.gitignore +++ b/TestVectors/runtimes/rust/.gitignore @@ -24,6 +24,7 @@ src/local_cmc.rs src/operation src/operation.rs src/random.rs +src/oslang.rs src/rsa.rs src/sets.rs src/software_externs.rs diff --git a/TestVectors/runtimes/rust/copy_externs.sh b/TestVectors/runtimes/rust/copy_externs.sh index 8a13fc3ea..81792034a 100755 --- a/TestVectors/runtimes/rust/copy_externs.sh +++ b/TestVectors/runtimes/rust/copy_externs.sh @@ -16,6 +16,7 @@ cp $SRC/hmac.rs src cp $SRC/kms.rs src cp $SRC/local_cmc.rs src cp $SRC/random.rs src +cp $SRC/oslang.rs src cp $SRC/rsa.rs src cp $SRC/sets.rs src cp ../../../DynamoDbEncryption/runtimes/rust/src/software_externs.rs src diff --git a/TestVectors/runtimes/rust/src/lib.rs b/TestVectors/runtimes/rust/src/lib.rs index 43e76f8ae..eb2db89f9 100644 --- a/TestVectors/runtimes/rust/src/lib.rs +++ b/TestVectors/runtimes/rust/src/lib.rs @@ -55,6 +55,7 @@ pub mod ecdsa; pub mod hmac; pub mod kms; pub mod local_cmc; +pub mod oslang; pub mod random; pub mod rsa; pub mod sets; diff --git a/submodules/MaterialProviders b/submodules/MaterialProviders index 59979192a..1915a11bb 160000 --- a/submodules/MaterialProviders +++ b/submodules/MaterialProviders @@ -1 +1 @@ -Subproject commit 59979192a51ef5b1864ac36d57925d55eb562fa2 +Subproject commit 1915a11bb84d3d9135b89d2a46ec9d6dff27b493