From ab3893b4460e170a24f436cfefe2a1772b9882a9 Mon Sep 17 00:00:00 2001 From: Andy Jewell Date: Thu, 27 Mar 2025 09:35:23 -0400 Subject: [PATCH 1/5] chore(c): add C to list of langugaes checked for interoperability --- .../library_interop_keyring_test_vectors.yml | 190 +++++++++++++++++- TestVectors/Makefile | 61 +++++- 2 files changed, 246 insertions(+), 5 deletions(-) diff --git a/.github/workflows/library_interop_keyring_test_vectors.yml b/.github/workflows/library_interop_keyring_test_vectors.yml index df0acb015..8601e9e0a 100644 --- a/.github/workflows/library_interop_keyring_test_vectors.yml +++ b/.github/workflows/library_interop_keyring_test_vectors.yml @@ -30,7 +30,7 @@ jobs: # windows-latest, ubuntu-22.04, ] - language: [java, net, rust, python, go] + language: [java, net, rust, python, go, c] # https://taskei.amazon.dev/tasks/CrypTool-5284 dotnet-version: ["6.0.x"] runs-on: ${{ matrix.os }} @@ -55,7 +55,84 @@ jobs: with: submodules: "recursive" - # Set up runtimes + - name: Install OpenSSL + if: matrix.os != 'ubuntu-22.04' && matrix.language == 'c' + run: brew install openssl + + - name: Install dependencies + if: matrix.os != 'ubuntu-22.04' && matrix.language == 'c' + run: + brew install json-c + + - name: Install LibCurl + if: matrix.os == 'ubuntu-22.04' && matrix.language == 'c' + run: sudo apt-get install libcurl4-openssl-dev + + - name: Checkout C-ESDK + if: matrix.language == 'c' + uses: actions/checkout@v4 + with: + repository: "aws/aws-encryption-sdk-c" + path: ./${{ matrix.library }}/aws-encryption-sdk-c + submodules: recursive + + - name: Checkout AWS C++ SDK + if: matrix.language == 'c' + uses: actions/checkout@v4 + with: + repository: "aws/aws-sdk-cpp" + path: ./${{ matrix.library }}/aws-encryption-sdk-c/aws-sdk-cpp + submodules: recursive + + - name: Build and install aws-sdk-cpp + if: matrix.language == 'c' && matrix.os != 'ubuntu-22.04' + working-directory: ./${{ matrix.library }}/aws-encryption-sdk-c + run: | + # remove the following line once aws-sdk-cpp fixes linux-shared/SimpleUDP.cpp + perl -i -p -e 's/"-Werror"//' aws-sdk-cpp/cmake/compiler_settings.cmake + mkdir -p aws-encryption-sdk-c/build-aws-sdk-cpp || true + mkdir -p install || true + cd build-aws-sdk-cpp + cmake -G Xcode -DTARGET_ARCH="APPLE" -DBUILD_SHARED_LIBS=ON -DBUILD_ONLY="kms" -DENABLE_UNITY_BUILD=ON -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/TestVectors/aws-encryption-sdk-c/install -DCMAKE_PREFIX_PATH=${{github.workspace}}/TestVectors/aws-encryption-sdk-c/install ../aws-sdk-cpp + xcodebuild -target ALL_BUILD + xcodebuild -target install + + - name: Build and install aws-sdk-cpp + if: matrix.os == 'ubuntu-22.04' && matrix.language == 'c' + working-directory: ./${{ matrix.library }}/aws-encryption-sdk-c + run: | + # remove the following line once aws-sdk-cpp fixes linux-shared/SimpleUDP.cpp + perl -i -p -e 's/"-Werror"//' aws-sdk-cpp/cmake/compiler_settings.cmake + mkdir -p build-aws-sdk-cpp || true + mkdir -p install || true + cd build-aws-sdk-cpp + cmake -DBUILD_SHARED_LIBS=ON -DBUILD_ONLY="kms" -DENABLE_UNITY_BUILD=ON -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/TestVectors/aws-encryption-sdk-c/install -DCMAKE_PREFIX_PATH=${{github.workspace}}/TestVectors/aws-encryption-sdk-c/install ../aws-sdk-cpp + make + make install + + - name: Build C-ESDK + if: matrix.language == 'c' && matrix.os != 'ubuntu-22.04' + working-directory: ./${{ matrix.library }}/aws-encryption-sdk-c + run: | + mkdir build-aws-encryption-sdk-c || true + cd build-aws-encryption-sdk-c + cmake -G Xcode -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/TestVectors/aws-encryption-sdk-c/install -DCMAKE_PREFIX_PATH=${{github.workspace}}/TestVectors/aws-encryption-sdk-c/install -DOPENSSL_ROOT_DIR="/usr/local/opt/openssl@1.1" ../ + xcodebuild -target ALL_BUILD + xcodebuild -scheme RUN_TESTS + + - name: Build C-ESDK + if: matrix.language == 'c' && matrix.os == 'ubuntu-22.04' + working-directory: ./${{ matrix.library }}/aws-encryption-sdk-c + # TODO-RS: Figure out how to safely add AWS credentials and add -DAWS_ENC_SDK_END_TO_END_TESTS=ON and -DAWS_ENC_SDK_KNOWN_GOOD_TESTS=ON + run: | + mkdir build-aws-encryption-sdk-c || true + cd build-aws-encryption-sdk-c + cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/TestVectors/aws-encryption-sdk-c/install -DCMAKE_PREFIX_PATH=${{github.workspace}}/TestVectors/aws-encryption-sdk-c/install .. + make + make test + make install + + # Set up runtimes - name: Setup .NET Core SDK ${{ matrix.dotnet-version }} if: matrix.language == 'net' uses: actions/setup-dotnet@v3 @@ -191,15 +268,27 @@ jobs: gradle-version: 7.2 - name: Create Keyring Manifests + if: matrix.language != 'c' working-directory: ./${{ matrix.library }} # Only MKP manifests will be written in the legacy format run: | make test_generate_vectors_${{ matrix.language }} - name: Create Keyring Encrypt Manifests + if: matrix.language != 'c' working-directory: ./${{ matrix.library }} run: make test_encrypt_vectors_${{ matrix.language }} + - name: Create Encrypt Manifests + if: matrix.language == 'c' && matrix.os != 'ubuntu-22.04' + working-directory: ./${{ matrix.library }} + run: make test_encrypt_vectors_c_mac + + - name: Create Encrypt Manifests + if: matrix.language == 'c' && matrix.os == 'ubuntu-22.04' + working-directory: ./${{ matrix.library }} + run: make test_encrypt_vectors_c_unix + - name: Upload Keyring Encrypt Manifest and keys.json files uses: actions/upload-artifact@v4 with: @@ -220,8 +309,8 @@ jobs: # windows-latest, ubuntu-22.04, ] - encrypting_language: [java, net, rust, python, go] - decrypting_language: [java, net, rust, python, go] + encrypting_language: [java, net, rust, python, go, c] + decrypting_language: [java, net, rust, python, go, c] # https://taskei.amazon.dev/tasks/CrypTool-5284 dotnet-version: ["6.0.x"] runs-on: ${{ matrix.os }} @@ -247,6 +336,88 @@ jobs: with: submodules: "recursive" + - name: Install OpenSSL + if: matrix.os != 'ubuntu-22.04' && matrix.decrypting_language == 'c' + run: brew install openssl + + - name: Install dependencies + if: matrix.os != 'ubuntu-22.04' && matrix.decrypting_language == 'c' + run: + brew install json-c + + - name: Install LibCurl + if: matrix.os == 'ubuntu-22.04' && matrix.decrypting_language == 'c' + run: sudo apt-get install libcurl4-openssl-dev + + - name: Checkout C-ESDK + if: matrix.decrypting_language == 'c' + uses: actions/checkout@v4 + with: + repository: "aws/aws-encryption-sdk-c" + path: ./${{ matrix.library }}/aws-encryption-sdk-c + submodules: recursive + + - name: Checkout AWS C++ SDK + if: matrix.decrypting_language == 'c' + uses: actions/checkout@v4 + with: + repository: "aws/aws-sdk-cpp" + path: ./${{ matrix.library }}/aws-encryption-sdk-c/aws-sdk-cpp + submodules: recursive + + - name: Build and install aws-sdk-cpp + if: matrix.decrypting_language == 'c' && matrix.os != 'ubuntu-22.04' + working-directory: ./${{ matrix.library }}/aws-encryption-sdk-c + run: | + pwd + ls + # remove the following line once aws-sdk-cpp fixes linux-shared/SimpleUDP.cpp + perl -i -p -e 's/"-Werror"//' aws-sdk-cpp/cmake/compiler_settings.cmake + mkdir -p aws-encryption-sdk-c/build-aws-sdk-cpp || true + mkdir -p install || true + cd build-aws-sdk-cpp + cmake -G Xcode -DTARGET_ARCH="APPLE" -DBUILD_SHARED_LIBS=ON -DBUILD_ONLY="kms" -DENABLE_UNITY_BUILD=ON -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/aws-encryption-sdk-c/install -DCMAKE_PREFIX_PATH=${{github.workspace}}/aws-encryption-sdk-c/install ../aws-sdk-cpp + xcodebuild -target ALL_BUILD + xcodebuild -target install + + - name: Build and install aws-sdk-cpp + if: matrix.os == 'ubuntu-22.04' && matrix.decrypting_language == 'c' + working-directory: ./${{ matrix.library }}/aws-encryption-sdk-c + run: | + pwd + ls + # remove the following line once aws-sdk-cpp fixes linux-shared/SimpleUDP.cpp + perl -i -p -e 's/"-Werror"//' aws-sdk-cpp/cmake/compiler_settings.cmake + mkdir -p build-aws-sdk-cpp || true + mkdir -p install || true + cd build-aws-sdk-cpp + cmake -DBUILD_SHARED_LIBS=ON -DBUILD_ONLY="kms" -DENABLE_UNITY_BUILD=ON -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/TestVectors/aws-encryption-sdk-c/install -DCMAKE_PREFIX_PATH=${{github.workspace}}/TestVectors/aws-encryption-sdk-c/install ../aws-sdk-cpp + make + make install + + - name: Build C-ESDK + if: matrix.decrypting_language == 'c' && matrix.os != 'ubuntu-22.04' + working-directory: ./${{ matrix.library }}/aws-encryption-sdk-c + run: | + mkdir build-aws-encryption-sdk-c || true + cd build-aws-encryption-sdk-c + cmake -G Xcode -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/TestVectors/aws-encryption-sdk-c/install -DCMAKE_PREFIX_PATH=${{github.workspace}}/TestVectors/aws-encryption-sdk-c/install -DOPENSSL_ROOT_DIR="/usr/local/opt/openssl@1.1" ../ + xcodebuild -target ALL_BUILD + xcodebuild -scheme RUN_TESTS + + - name: Build C-ESDK + if: matrix.decrypting_language == 'c' && matrix.os == 'ubuntu-22.04' + working-directory: ./${{ matrix.library }}/aws-encryption-sdk-c + # TODO-RS: Figure out how to safely add AWS credentials and add -DAWS_ENC_SDK_END_TO_END_TESTS=ON and -DAWS_ENC_SDK_KNOWN_GOOD_TESTS=ON + run: | + mkdir build-aws-encryption-sdk-c || true + cd build-aws-encryption-sdk-c + cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/TestVectors/aws-encryption-sdk-c/install -DCMAKE_PREFIX_PATH=${{github.workspace}}/TestVectors/aws-encryption-sdk-c/install .. + make + make test + make install + + # Set up runtimes - name: Setup .NET Core SDK ${{ matrix.dotnet-version }} if: matrix.decrypting_language == 'net' @@ -382,5 +553,16 @@ jobs: path: ./${{matrix.library}}/runtimes/${{matrix.decrypting_language}} - name: Decrypt Encrypt Manifest + if: matrix.decrypting_language != 'c' working-directory: ./${{ matrix.library }} run: make test_decrypt_encrypt_vectors_${{matrix.decrypting_language}} + + - name: Decrypt Encrypt Manifest + if: matrix.decrypting_language == 'c' && matrix.os == 'ubuntu-22.04' + working-directory: ./${{ matrix.library }} + run: make test_decrypt_encrypt_vectors_c_unix + + - name: Decrypt Encrypt Manifest + if: matrix.decrypting_language == 'c' && matrix.os != 'ubuntu-22.04' + working-directory: ./${{ matrix.library }} + run: make test_decrypt_encrypt_vectors_c_mac diff --git a/TestVectors/Makefile b/TestVectors/Makefile index 15d610aa9..4f88d2643 100644 --- a/TestVectors/Makefile +++ b/TestVectors/Makefile @@ -337,6 +337,65 @@ _sed_types_file_add_extern: _sed_index_file_add_extern: @echo "No extern to process for ESDK TestVectors" +c_test_vectors: + cd aws-encryption-sdk-c/tests/TestVectors; \ + g++ -g -ggdb --std=c++17 -o test_vectors -I../../include/ \ + base64.cpp do_decrypt.cpp do_encrypt.cpp parse_encrypt.cpp parse_keys.cpp test_vectors.cpp \ + -I/opt/homebrew/include/ -L/opt/homebrew/lib/ \ + -I../../install/include/ -L../../install/lib/ -I ../../aws-encryption-sdk-cpp/include/ \ + ../../build-aws-encryption-sdk-c/Debug/libaws-encryption-sdk.dylib \ + ../../build-aws-encryption-sdk-c/aws-encryption-sdk-cpp/Debug/libaws-encryption-sdk-cpp.dylib \ + -laws-cpp-sdk-core -laws-cpp-sdk-kms -laws-c-common -lcrypto; \ + install_name_tool -add_rpath ../../build-aws-encryption-sdk-c/Debug/ test_vectors; \ + install_name_tool -add_rpath ../../build-aws-encryption-sdk-c/aws-encryption-sdk-cpp/Debug/ test_vectors; \ + install_name_tool -add_rpath ../../install/lib/ test_vectors + +c_test_vectors_unix: + cd aws-encryption-sdk-c/tests/TestVectors; \ + ls ../../install/; \ + ls ../../install/include/; \ + g++ -g -ggdb --std=c++17 -o test_vectors -I../../include/ \ + base64.cpp do_decrypt.cpp do_encrypt.cpp parse_encrypt.cpp parse_keys.cpp test_vectors.cpp \ + -I../../install/include/ -L../../install/lib/ -I ../../aws-encryption-sdk-cpp/include/ \ + -laws-encryption-sdk -laws-encryption-sdk-cpp \ + -laws-cpp-sdk-core -laws-cpp-sdk-kms -laws-c-common -lcrypto + +test_encrypt_vectors_c_mac: c_test_vectors + cd aws-encryption-sdk-c/tests/TestVectors; \ + rm -rf local; \ + mkdir -p local; \ + LD_LIBRARY_PATH=../../install/lib/ ./test_vectors encrypt --manifest-path ./from-dafny --decrypt-manifest-path ./local + mkdir -p ./runtimes/c/ + cp aws-encryption-sdk-c/tests/TestVectors/local/*.json ./runtimes/c/ + cp -r aws-encryption-sdk-c/tests/TestVectors/local/plaintexts/ ./runtimes/c/plaintexts/ + cp -r aws-encryption-sdk-c/tests/TestVectors/local/ciphertexts/ ./runtimes/c/ciphertexts/ + +test_encrypt_vectors_c_unix: c_test_vectors_unix + cd aws-encryption-sdk-c/tests/TestVectors; \ + rm -rf local; \ + mkdir -p local; \ + LD_LIBRARY_PATH=../../install/lib/ ./test_vectors encrypt --manifest-path ./from-dafny --decrypt-manifest-path ./local + mkdir -p ./runtimes/c/ + cp aws-encryption-sdk-c/tests/TestVectors/local/*.json ./runtimes/c/ + cp -r aws-encryption-sdk-c/tests/TestVectors/local/plaintexts/ ./runtimes/c/plaintexts/ + cp -r aws-encryption-sdk-c/tests/TestVectors/local/ciphertexts/ ./runtimes/c/ciphertexts/ + +test_decrypt_encrypt_vectors_c_mac: c_test_vectors + mkdir -p aws-encryption-sdk-c/tests/TestVectors/local/ + cp ./runtimes/c/*.json aws-encryption-sdk-c/tests/TestVectors/local/ + cp -r ./runtimes/c/plaintexts/ aws-encryption-sdk-c/tests/TestVectors/local/plaintexts/ + cp -r ./runtimes/c/ciphertexts/ aws-encryption-sdk-c/tests/TestVectors/local/ciphertexts/ + cd aws-encryption-sdk-c/tests/TestVectors; \ + LD_LIBRARY_PATH=../../install/lib/ ./test_vectors decrypt --manifest-path ./local --manifest-name decrypt-manifest.json + +test_decrypt_encrypt_vectors_c_unix: c_test_vectors_unix + mkdir -p aws-encryption-sdk-c/tests/TestVectors/local/ + cp ./runtimes/c/*.json aws-encryption-sdk-c/tests/TestVectors/local/ + cp -r ./runtimes/c/plaintexts/ aws-encryption-sdk-c/tests/TestVectors/local/plaintexts/ + cp -r ./runtimes/c/ciphertexts/ aws-encryption-sdk-c/tests/TestVectors/local/ciphertexts/ + cd aws-encryption-sdk-c/tests/TestVectors; \ + LD_LIBRARY_PATH=../../install/lib/ ./test_vectors decrypt --manifest-path ./local --manifest-name decrypt-manifest.json + PYTHON_MODULE_NAME=aws_encryption_sdk_test_vectors TRANSLATION_RECORD_PYTHON := \ @@ -356,4 +415,4 @@ PYTHON_DEPENDENCY_MODULE_NAMES := \ --dependency-library-name=aws.cryptography.keyStore=aws_cryptographic_material_providers \ --dependency-library-name=smithy.api=aws_cryptographic_material_providers \ --dependency-library-name=aws.cryptography.materialProvidersTestVectorKeys=aws_cryptographic_material_providers_test_vectors \ - --dependency-library-name=aws.cryptography.encryptionSdk=aws_encryption_sdk_dafny \ No newline at end of file + --dependency-library-name=aws.cryptography.encryptionSdk=aws_encryption_sdk_dafny From 3eca1176e272e3cc784e22b49ec39652f9fa15f7 Mon Sep 17 00:00:00 2001 From: Andy Jewell Date: Thu, 27 Mar 2025 10:24:45 -0400 Subject: [PATCH 2/5] m --- .../library_interop_keyring_test_vectors.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/library_interop_keyring_test_vectors.yml b/.github/workflows/library_interop_keyring_test_vectors.yml index 8601e9e0a..e347c8047 100644 --- a/.github/workflows/library_interop_keyring_test_vectors.yml +++ b/.github/workflows/library_interop_keyring_test_vectors.yml @@ -61,8 +61,7 @@ jobs: - name: Install dependencies if: matrix.os != 'ubuntu-22.04' && matrix.language == 'c' - run: - brew install json-c + run: brew install json-c - name: Install LibCurl if: matrix.os == 'ubuntu-22.04' && matrix.language == 'c' @@ -131,7 +130,7 @@ jobs: make make test make install - + # Set up runtimes - name: Setup .NET Core SDK ${{ matrix.dotnet-version }} if: matrix.language == 'net' @@ -342,8 +341,7 @@ jobs: - name: Install dependencies if: matrix.os != 'ubuntu-22.04' && matrix.decrypting_language == 'c' - run: - brew install json-c + run: brew install json-c - name: Install LibCurl if: matrix.os == 'ubuntu-22.04' && matrix.decrypting_language == 'c' @@ -416,8 +414,7 @@ jobs: make make test make install - - + # Set up runtimes - name: Setup .NET Core SDK ${{ matrix.dotnet-version }} if: matrix.decrypting_language == 'net' From e386efe79589843234dee19ff3d3f067ca6abb21 Mon Sep 17 00:00:00 2001 From: Andy Jewell Date: Thu, 27 Mar 2025 11:38:46 -0400 Subject: [PATCH 3/5] m --- TestVectors/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/TestVectors/Makefile b/TestVectors/Makefile index 4f88d2643..6c3b6a8d2 100644 --- a/TestVectors/Makefile +++ b/TestVectors/Makefile @@ -376,6 +376,9 @@ test_encrypt_vectors_c_unix: c_test_vectors_unix mkdir -p local; \ LD_LIBRARY_PATH=../../install/lib/ ./test_vectors encrypt --manifest-path ./from-dafny --decrypt-manifest-path ./local mkdir -p ./runtimes/c/ + pwd + ls -l aws-encryption-sdk-c/tests/TestVectors/ + ls -l aws-encryption-sdk-c/tests/TestVectors/local/ cp aws-encryption-sdk-c/tests/TestVectors/local/*.json ./runtimes/c/ cp -r aws-encryption-sdk-c/tests/TestVectors/local/plaintexts/ ./runtimes/c/plaintexts/ cp -r aws-encryption-sdk-c/tests/TestVectors/local/ciphertexts/ ./runtimes/c/ciphertexts/ @@ -390,7 +393,9 @@ test_decrypt_encrypt_vectors_c_mac: c_test_vectors test_decrypt_encrypt_vectors_c_unix: c_test_vectors_unix mkdir -p aws-encryption-sdk-c/tests/TestVectors/local/ - cp ./runtimes/c/*.json aws-encryption-sdk-c/tests/TestVectors/local/ + pwd + ls -l ./runtimes/c/ + cp ./runtimes/c/*.json aws-encryption-sdk-c/tests/TestVectors/local/ cp -r ./runtimes/c/plaintexts/ aws-encryption-sdk-c/tests/TestVectors/local/plaintexts/ cp -r ./runtimes/c/ciphertexts/ aws-encryption-sdk-c/tests/TestVectors/local/ciphertexts/ cd aws-encryption-sdk-c/tests/TestVectors; \ From 74dbe47b1514afd5fbc7e595ee83312625741d48 Mon Sep 17 00:00:00 2001 From: Andy Jewell Date: Thu, 27 Mar 2025 13:28:43 -0400 Subject: [PATCH 4/5] m --- TestVectors/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/TestVectors/Makefile b/TestVectors/Makefile index 6c3b6a8d2..90e30b5c5 100644 --- a/TestVectors/Makefile +++ b/TestVectors/Makefile @@ -367,6 +367,7 @@ test_encrypt_vectors_c_mac: c_test_vectors LD_LIBRARY_PATH=../../install/lib/ ./test_vectors encrypt --manifest-path ./from-dafny --decrypt-manifest-path ./local mkdir -p ./runtimes/c/ cp aws-encryption-sdk-c/tests/TestVectors/local/*.json ./runtimes/c/ + cp aws-encryption-sdk-c/tests/TestVectors/local/decrypt-manifest.json ./runtimes/c/manifest.json cp -r aws-encryption-sdk-c/tests/TestVectors/local/plaintexts/ ./runtimes/c/plaintexts/ cp -r aws-encryption-sdk-c/tests/TestVectors/local/ciphertexts/ ./runtimes/c/ciphertexts/ @@ -389,7 +390,7 @@ test_decrypt_encrypt_vectors_c_mac: c_test_vectors cp -r ./runtimes/c/plaintexts/ aws-encryption-sdk-c/tests/TestVectors/local/plaintexts/ cp -r ./runtimes/c/ciphertexts/ aws-encryption-sdk-c/tests/TestVectors/local/ciphertexts/ cd aws-encryption-sdk-c/tests/TestVectors; \ - LD_LIBRARY_PATH=../../install/lib/ ./test_vectors decrypt --manifest-path ./local --manifest-name decrypt-manifest.json + LD_LIBRARY_PATH=../../install/lib/ ./test_vectors decrypt --manifest-path ./local --manifest-name manifest.json test_decrypt_encrypt_vectors_c_unix: c_test_vectors_unix mkdir -p aws-encryption-sdk-c/tests/TestVectors/local/ @@ -399,7 +400,7 @@ test_decrypt_encrypt_vectors_c_unix: c_test_vectors_unix cp -r ./runtimes/c/plaintexts/ aws-encryption-sdk-c/tests/TestVectors/local/plaintexts/ cp -r ./runtimes/c/ciphertexts/ aws-encryption-sdk-c/tests/TestVectors/local/ciphertexts/ cd aws-encryption-sdk-c/tests/TestVectors; \ - LD_LIBRARY_PATH=../../install/lib/ ./test_vectors decrypt --manifest-path ./local --manifest-name decrypt-manifest.json + LD_LIBRARY_PATH=../../install/lib/ ./test_vectors decrypt --manifest-path ./local --manifest-name manifest.json PYTHON_MODULE_NAME=aws_encryption_sdk_test_vectors From e12b489d8b877a7ce0db2b65d2b4b7f6e2aaf01b Mon Sep 17 00:00:00 2001 From: Andy Jewell Date: Thu, 27 Mar 2025 14:37:48 -0400 Subject: [PATCH 5/5] m --- TestVectors/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/TestVectors/Makefile b/TestVectors/Makefile index 90e30b5c5..424561e66 100644 --- a/TestVectors/Makefile +++ b/TestVectors/Makefile @@ -367,7 +367,7 @@ test_encrypt_vectors_c_mac: c_test_vectors LD_LIBRARY_PATH=../../install/lib/ ./test_vectors encrypt --manifest-path ./from-dafny --decrypt-manifest-path ./local mkdir -p ./runtimes/c/ cp aws-encryption-sdk-c/tests/TestVectors/local/*.json ./runtimes/c/ - cp aws-encryption-sdk-c/tests/TestVectors/local/decrypt-manifest.json ./runtimes/c/manifest.json + mv ./runtimes/c/decrypt-manifest.json ./runtimes/c/manifest.json cp -r aws-encryption-sdk-c/tests/TestVectors/local/plaintexts/ ./runtimes/c/plaintexts/ cp -r aws-encryption-sdk-c/tests/TestVectors/local/ciphertexts/ ./runtimes/c/ciphertexts/ @@ -381,6 +381,7 @@ test_encrypt_vectors_c_unix: c_test_vectors_unix ls -l aws-encryption-sdk-c/tests/TestVectors/ ls -l aws-encryption-sdk-c/tests/TestVectors/local/ cp aws-encryption-sdk-c/tests/TestVectors/local/*.json ./runtimes/c/ + mv ./runtimes/c/decrypt-manifest.json ./runtimes/c/manifest.json cp -r aws-encryption-sdk-c/tests/TestVectors/local/plaintexts/ ./runtimes/c/plaintexts/ cp -r aws-encryption-sdk-c/tests/TestVectors/local/ciphertexts/ ./runtimes/c/ciphertexts/