Skip to content

Commit 1835214

Browse files
fix: Improve header serialization (#747)
1 parent 899af22 commit 1835214

29 files changed

+317
-57
lines changed

CHANGELOG.rst

+20
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,24 @@
22
Changelog
33
*********
44

5+
4.0.1 -- 2025-03-26
6+
===================
7+
8+
Fixes
9+
-----------
10+
* fix: Improve header serialization
11+
`#747 <https://github.com/aws/aws-encryption-sdk-python/pull/747>`_
12+
13+
ESDK-Python <4.0.1 would truncate non-ASCII key provider IDs it wrote to message headers.
14+
If a Raw or Custom MasterKeyProvider or Keyring supplied a non-ASCII key provider ID / key namespace,
15+
ESDK-Python would truncate the the key provider ID it wrote to the message's header.
16+
The message can be decrypted by replacing the truncated provider ID with the expected provider ID in decryption code.
17+
Contact AWS for any questions about this approach.
18+
19+
Maintenance
20+
-----------
21+
* deps: Extend supported `MPL`_ versions to include v1.10.0
22+
523
4.0.0 -- 2024-10-29
624
===================
725

@@ -23,6 +41,7 @@ Breaking Changes
2341
However, messages that are constructed with the required EC CMM are not backward compatible with ESDK <4.0.0,
2442
as no version of ESDK <4.0.0 supports reading messages encrypted with the required EC CMM.
2543
A message that is encrypted with the required EC CMM from the MPL must be decrypted with a CMM from the MPL.
44+
For more information on using the required EC CMM, see `AWS Documentation <https://docs.aws.amazon.com/encryption-sdk/latest/developer-guide/configure.html#config-required-encryption-context-cmm>`_.
2645

2746
Fixes
2847
-----------
@@ -425,6 +444,7 @@ Minor
425444
===================
426445
* Initial public release
427446

447+
.. _MPL: https://github.com/aws/aws-cryptographic-material-providers-library
428448
.. _breaking changes in attrs 17.1.0: https://attrs.readthedocs.io/en/stable/changelog.html
429449
.. _tox: https://tox.readthedocs.io/en/latest/
430450
.. _pylint: https://www.pylint.org/

README.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ Required Prerequisites
4242
Recommended Prerequisites
4343
=========================
4444

45-
* aws-cryptographic-material-providers: == 1.7.4
45+
* aws-cryptographic-material-providers: == 1.10.0
4646
* Requires Python 3.11+.
4747

4848
Installation
@@ -246,7 +246,7 @@ sharing entries in that cache across threads needs to be done carefully
246246

247247
**Important:** Components from the `AWS Cryptographic Material Providers Library (MPL)`_
248248
have separate thread safety considerations.
249-
For more information, see the note on thread safety in that project's README (TODO-MPL: link)
249+
For more information, see the note on thread safety in that project's `README <https://github.com/aws/aws-cryptographic-material-providers-library/blob/main/AwsCryptographicMaterialProviders/runtimes/python/README.rst#thread-safety>`_.
250250

251251

252252
.. _AWS Encryption SDK: https://docs.aws.amazon.com/encryption-sdk/latest/developer-guide/introduction.html

codebuild/py310/decrypt_dafny_esdk_vectors.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,25 @@ phases:
2828
MOST_RECENT_RUN_ID=$(curl -H "Accept: application/vnd.github+json" \
2929
-H "Authorization: token ${GITHUB_TOKEN}" \
3030
-H "X-GitHub-Api-Version: 2022-11-28" \
31-
"https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
31+
"https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
3232
| jq 'first(.workflow_runs[] | select(.name=="Daily CI") | .id)')
3333
- |
3434
echo "DEBUG: Fetching artifact from run $MOST_RECENT_RUN_ID"
3535
- |
3636
MOST_RECENT_RUN_DOWNLOAD_URL=$(curl -H "Accept: application/vnd.github+json" \
3737
-H "Authorization: token $GITHUB_TOKEN" \
3838
-H "X-GitHub-Api-Version: 2022-11-28" \
39-
"https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-latest_vector_artifact" \
39+
"https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-22.04_vector_artifact" \
4040
| jq '.artifacts[0].archive_download_url')
4141
- |
4242
echo "DEBUG: Fetching artifact at $MOST_RECENT_RUN_DOWNLOAD_URL"
4343
- |
4444
curl -L -H "Accept: application/vnd.github+json" \
4545
-H "Authorization: token $GITHUB_TOKEN" \
4646
-H "X-GitHub-Api-Version: 2022-11-28" \
47-
$(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-latest_test_vector_artifact.zip
47+
$(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-22.04_vector_artifact.zip
4848
# This unzips to `net41.zip`.
49-
- unzip ubuntu-latest_test_vector_artifact
49+
- unzip ubuntu-22.04_vector_artifact
5050
# This unzips to `net41/`.
5151
- unzip net41.zip -d net41
5252
build:

codebuild/py310/decrypt_net_401_vectors.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ phases:
2121
commands:
2222
# Fetch ESDK .NET v4.0.1 Test Vectors
2323
- VECTOR_ZIP=$CODEBUILD_SRC_DIR/v4-Net-4.0.1.zip
24-
- VECTORS_URL=https://github.com/aws/aws-encryption-sdk-dafny/raw/mainline/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors/resources/v4-Net-4.0.1.zip
24+
- VECTORS_URL=https://github.com/aws/aws-encryption-sdk/raw/mainline/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors/resources/v4-Net-4.0.1.zip
2525
- curl -s --output $VECTOR_ZIP --location $VECTORS_URL
2626
- UNZIPPED_VECTORS_DIR=$CODEBUILD_SRC_DIR/test_vector_handlers/net_401_vectors
2727
- unzip $VECTOR_ZIP -d $UNZIPPED_VECTORS_DIR

codebuild/py311/decrypt_dafny_esdk_vectors_keyrings.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,25 +30,25 @@ phases:
3030
MOST_RECENT_RUN_ID=$(curl -H "Accept: application/vnd.github+json" \
3131
-H "Authorization: token ${GITHUB_TOKEN}" \
3232
-H "X-GitHub-Api-Version: 2022-11-28" \
33-
"https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
33+
"https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
3434
| jq 'first(.workflow_runs[] | select(.name=="Daily CI") | .id)')
3535
- |
3636
echo "DEBUG: Fetching artifact from run $MOST_RECENT_RUN_ID"
3737
- |
3838
MOST_RECENT_RUN_DOWNLOAD_URL=$(curl -H "Accept: application/vnd.github+json" \
3939
-H "Authorization: token $GITHUB_TOKEN" \
4040
-H "X-GitHub-Api-Version: 2022-11-28" \
41-
"https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-latest_vector_artifact" \
41+
"https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-22.04_vector_artifact" \
4242
| jq '.artifacts[0].archive_download_url')
4343
- |
4444
echo "DEBUG: Fetching artifact at $MOST_RECENT_RUN_DOWNLOAD_URL"
4545
- |
4646
curl -L -H "Accept: application/vnd.github+json" \
4747
-H "Authorization: token $GITHUB_TOKEN" \
4848
-H "X-GitHub-Api-Version: 2022-11-28" \
49-
$(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-latest_test_vector_artifact.zip
49+
$(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-22.04_vector_artifact.zip
5050
# This unzips to `net41.zip`.
51-
- unzip ubuntu-latest_test_vector_artifact
51+
- unzip ubuntu-22.04_vector_artifact
5252
# This unzips to `net41/`.
5353
- unzip net41.zip -d net41
5454
build:

codebuild/py311/decrypt_dafny_esdk_vectors_masterkey.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,25 @@ phases:
2828
MOST_RECENT_RUN_ID=$(curl -H "Accept: application/vnd.github+json" \
2929
-H "Authorization: token ${GITHUB_TOKEN}" \
3030
-H "X-GitHub-Api-Version: 2022-11-28" \
31-
"https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
31+
"https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
3232
| jq 'first(.workflow_runs[] | select(.name=="Daily CI") | .id)')
3333
- |
3434
echo "DEBUG: Fetching artifact from run $MOST_RECENT_RUN_ID"
3535
- |
3636
MOST_RECENT_RUN_DOWNLOAD_URL=$(curl -H "Accept: application/vnd.github+json" \
3737
-H "Authorization: token $GITHUB_TOKEN" \
3838
-H "X-GitHub-Api-Version: 2022-11-28" \
39-
"https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-latest_vector_artifact" \
39+
"https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-22.04_vector_artifact" \
4040
| jq '.artifacts[0].archive_download_url')
4141
- |
4242
echo "DEBUG: Fetching artifact at $MOST_RECENT_RUN_DOWNLOAD_URL"
4343
- |
4444
curl -L -H "Accept: application/vnd.github+json" \
4545
-H "Authorization: token $GITHUB_TOKEN" \
4646
-H "X-GitHub-Api-Version: 2022-11-28" \
47-
$(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-latest_test_vector_artifact.zip
47+
$(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-22.04_vector_artifact.zip
4848
# This unzips to `net41.zip`.
49-
- unzip ubuntu-latest_test_vector_artifact
49+
- unzip ubuntu-22.04_vector_artifact
5050
# This unzips to `net41/`.
5151
- unzip net41.zip -d net41
5252
build:

codebuild/py311/decrypt_net_401_vectors_keyrings.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ phases:
2323
- sh test_vector_handlers/scripts/install_mpl_test_vector_runner.sh
2424
# Fetch ESDK .NET v4.0.1 Test Vectors
2525
- VECTOR_ZIP=$CODEBUILD_SRC_DIR/v4-Net-4.0.1.zip
26-
- VECTORS_URL=https://github.com/aws/aws-encryption-sdk-dafny/raw/mainline/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors/resources/v4-Net-4.0.1.zip
26+
- VECTORS_URL=https://github.com/aws/aws-encryption-sdk/raw/mainline/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors/resources/v4-Net-4.0.1.zip
2727
- curl -s --output $VECTOR_ZIP --location $VECTORS_URL
2828
- UNZIPPED_VECTORS_DIR=$CODEBUILD_SRC_DIR/test_vector_handlers/net_401_vectors
2929
- unzip $VECTOR_ZIP -d $UNZIPPED_VECTORS_DIR

codebuild/py311/decrypt_net_401_vectors_masterkey.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ phases:
3131

3232
# Fetch ESDK .NET v4.0.1 Test Vectors
3333
- VECTOR_ZIP=$CODEBUILD_SRC_DIR/v4-Net-4.0.1.zip
34-
- VECTORS_URL=https://github.com/aws/aws-encryption-sdk-dafny/raw/mainline/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors/resources/v4-Net-4.0.1.zip
34+
- VECTORS_URL=https://github.com/aws/aws-encryption-sdk/raw/mainline/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors/resources/v4-Net-4.0.1.zip
3535
- curl -s --output $VECTOR_ZIP --location $VECTORS_URL
3636
- UNZIPPED_VECTORS_DIR=$CODEBUILD_SRC_DIR/test_vector_handlers/net_401_vectors
3737
- unzip $VECTOR_ZIP -d $UNZIPPED_VECTORS_DIR

codebuild/py312/decrypt_dafny_esdk_vectors_keyrings.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,25 +30,25 @@ phases:
3030
MOST_RECENT_RUN_ID=$(curl -H "Accept: application/vnd.github+json" \
3131
-H "Authorization: token ${GITHUB_TOKEN}" \
3232
-H "X-GitHub-Api-Version: 2022-11-28" \
33-
"https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
33+
"https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
3434
| jq 'first(.workflow_runs[] | select(.name=="Daily CI") | .id)')
3535
- |
3636
echo "DEBUG: Fetching artifact from run $MOST_RECENT_RUN_ID"
3737
- |
3838
MOST_RECENT_RUN_DOWNLOAD_URL=$(curl -H "Accept: application/vnd.github+json" \
3939
-H "Authorization: token $GITHUB_TOKEN" \
4040
-H "X-GitHub-Api-Version: 2022-11-28" \
41-
"https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-latest_vector_artifact" \
41+
"https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-22.04_vector_artifact" \
4242
| jq '.artifacts[0].archive_download_url')
4343
- |
4444
echo "DEBUG: Fetching artifact at $MOST_RECENT_RUN_DOWNLOAD_URL"
4545
- |
4646
curl -L -H "Accept: application/vnd.github+json" \
4747
-H "Authorization: token $GITHUB_TOKEN" \
4848
-H "X-GitHub-Api-Version: 2022-11-28" \
49-
$(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-latest_test_vector_artifact.zip
49+
$(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-22.04_vector_artifact.zip
5050
# This unzips to `net41.zip`.
51-
- unzip ubuntu-latest_test_vector_artifact
51+
- unzip ubuntu-22.04_vector_artifact
5252
# This unzips to `net41/`.
5353
- unzip net41.zip -d net41
5454
build:

codebuild/py312/decrypt_dafny_esdk_vectors_masterkey.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,25 @@ phases:
2828
MOST_RECENT_RUN_ID=$(curl -H "Accept: application/vnd.github+json" \
2929
-H "Authorization: token ${GITHUB_TOKEN}" \
3030
-H "X-GitHub-Api-Version: 2022-11-28" \
31-
"https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
31+
"https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
3232
| jq 'first(.workflow_runs[] | select(.name=="Daily CI") | .id)')
3333
- |
3434
echo "DEBUG: Fetching artifact from run $MOST_RECENT_RUN_ID"
3535
- |
3636
MOST_RECENT_RUN_DOWNLOAD_URL=$(curl -H "Accept: application/vnd.github+json" \
3737
-H "Authorization: token $GITHUB_TOKEN" \
3838
-H "X-GitHub-Api-Version: 2022-11-28" \
39-
"https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-latest_vector_artifact" \
39+
"https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-22.04_vector_artifact" \
4040
| jq '.artifacts[0].archive_download_url')
4141
- |
4242
echo "DEBUG: Fetching artifact at $MOST_RECENT_RUN_DOWNLOAD_URL"
4343
- |
4444
curl -L -H "Accept: application/vnd.github+json" \
4545
-H "Authorization: token $GITHUB_TOKEN" \
4646
-H "X-GitHub-Api-Version: 2022-11-28" \
47-
$(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-latest_test_vector_artifact.zip
47+
$(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-22.04_vector_artifact.zip
4848
# This unzips to `net41.zip`.
49-
- unzip ubuntu-latest_test_vector_artifact
49+
- unzip ubuntu-22.04_vector_artifact
5050
# This unzips to `net41/`.
5151
- unzip net41.zip -d net41
5252
build:

codebuild/py312/decrypt_hkeyring_with_net.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ phases:
2525
- export DAFNY_AWS_ESDK_TEST_VECTOR_MANIFEST_PATH="${PWD}/312_hkeyring_reccmm_manifest/manifest.json"
2626

2727
# Clone SDK-Dafny repo to get test vectors runner source code and the Dafny version to use
28-
- git clone --recurse-submodules https://github.com/aws/aws-encryption-sdk-dafny.git
28+
- git clone --recurse-submodules https://github.com/aws/aws-encryption-sdk.git
2929
# Download Dafny to build the test vector runner; get Dafny version from ESDK's project.properties file
30-
- export dafnyVersion=$(grep '^dafnyVersion=' aws-encryption-sdk-dafny/AwsEncryptionSDK/project.properties | cut -d '=' -f 2)
30+
- export dafnyVersion=$(grep '^dafnyVersion=' aws-encryption-sdk/project.properties | cut -d '=' -f 2)
3131
- curl https://github.com/dafny-lang/dafny/releases/download/v$dafnyVersion/dafny-$dafnyVersion-x64-ubuntu-20.04.zip -L -o dafny.zip
3232
- unzip -qq dafny.zip && rm dafny.zip
3333
- export PATH="$PWD/dafny:$PATH"
3434

3535
# Build MPL test vector runner from source
36-
- cd aws-encryption-sdk-dafny/mpl/TestVectorsAwsCryptographicMaterialProviders/
36+
- cd aws-encryption-sdk/mpl/TestVectorsAwsCryptographicMaterialProviders/
3737
- make transpile_net
3838

3939
# Change ESDK TestVectors project to reference the published .NET ESDK

codebuild/py312/decrypt_net_401_vectors_keyrings.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ phases:
2323
- sh test_vector_handlers/scripts/install_mpl_test_vector_runner.sh
2424
# Fetch ESDK .NET v4.0.1 Test Vectors
2525
- VECTOR_ZIP=$CODEBUILD_SRC_DIR/v4-Net-4.0.1.zip
26-
- VECTORS_URL=https://github.com/aws/aws-encryption-sdk-dafny/raw/mainline/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors/resources/v4-Net-4.0.1.zip
26+
- VECTORS_URL=https://github.com/aws/aws-encryption-sdk/raw/mainline/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors/resources/v4-Net-4.0.1.zip
2727
- curl -s --output $VECTOR_ZIP --location $VECTORS_URL
2828
- UNZIPPED_VECTORS_DIR=$CODEBUILD_SRC_DIR/test_vector_handlers/net_401_vectors
2929
- unzip $VECTOR_ZIP -d $UNZIPPED_VECTORS_DIR

codebuild/py312/decrypt_net_401_vectors_masterkey.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ phases:
3131

3232
# Fetch ESDK .NET v4.0.1 Test Vectors
3333
- VECTOR_ZIP=$CODEBUILD_SRC_DIR/v4-Net-4.0.1.zip
34-
- VECTORS_URL=https://github.com/aws/aws-encryption-sdk-dafny/raw/mainline/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors/resources/v4-Net-4.0.1.zip
34+
- VECTORS_URL=https://github.com/aws/aws-encryption-sdk/raw/mainline/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors/resources/v4-Net-4.0.1.zip
3535
- curl -s --output $VECTOR_ZIP --location $VECTORS_URL
3636
- UNZIPPED_VECTORS_DIR=$CODEBUILD_SRC_DIR/test_vector_handlers/net_401_vectors
3737
- unzip $VECTOR_ZIP -d $UNZIPPED_VECTORS_DIR

codebuild/py38/decrypt_dafny_esdk_vectors.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,25 @@ phases:
2828
MOST_RECENT_RUN_ID=$(curl -H "Accept: application/vnd.github+json" \
2929
-H "Authorization: token ${GITHUB_TOKEN}" \
3030
-H "X-GitHub-Api-Version: 2022-11-28" \
31-
"https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
31+
"https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs?branch=mainline&status=completed&page=1&exclude_pull_requests=true" \
3232
| jq 'first(.workflow_runs[] | select(.name=="Daily CI") | .id)')
3333
- |
3434
echo "DEBUG: Fetching artifact from run $MOST_RECENT_RUN_ID"
3535
- |
3636
MOST_RECENT_RUN_DOWNLOAD_URL=$(curl -H "Accept: application/vnd.github+json" \
3737
-H "Authorization: token $GITHUB_TOKEN" \
3838
-H "X-GitHub-Api-Version: 2022-11-28" \
39-
"https://api.github.com/repos/aws/aws-encryption-sdk-dafny/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-latest_vector_artifact" \
39+
"https://api.github.com/repos/aws/aws-encryption-sdk/actions/runs/$MOST_RECENT_RUN_ID/artifacts?name=ubuntu-22.04_vector_artifact" \
4040
| jq '.artifacts[0].archive_download_url')
4141
- |
4242
echo "DEBUG: Fetching artifact at $MOST_RECENT_RUN_DOWNLOAD_URL"
4343
- |
4444
curl -L -H "Accept: application/vnd.github+json" \
4545
-H "Authorization: token $GITHUB_TOKEN" \
4646
-H "X-GitHub-Api-Version: 2022-11-28" \
47-
$(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-latest_test_vector_artifact.zip
47+
$(echo $MOST_RECENT_RUN_DOWNLOAD_URL | tr -d '"') -o ubuntu-22.04_vector_artifact.zip
4848
# This unzips to `net41.zip`.
49-
- unzip ubuntu-latest_test_vector_artifact
49+
- unzip ubuntu-22.04_vector_artifact
5050
# This unzips to `net41/`.
5151
- unzip net41.zip -d net41
5252
build:

codebuild/py38/decrypt_net_401_vectors.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ phases:
2121
commands:
2222
# Fetch ESDK .NET v4.0.1 Test Vectors
2323
- VECTOR_ZIP=$CODEBUILD_SRC_DIR/v4-Net-4.0.1.zip
24-
- VECTORS_URL=https://github.com/aws/aws-encryption-sdk-dafny/raw/mainline/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors/resources/v4-Net-4.0.1.zip
24+
- VECTORS_URL=https://github.com/aws/aws-encryption-sdk/raw/mainline/AwsEncryptionSDK/runtimes/net/TestVectorsNative/TestVectors/resources/v4-Net-4.0.1.zip
2525
- curl -s --output $VECTOR_ZIP --location $VECTORS_URL
2626
- UNZIPPED_VECTORS_DIR=$CODEBUILD_SRC_DIR/test_vector_handlers/net_401_vectors
2727
- unzip $VECTOR_ZIP -d $UNZIPPED_VECTORS_DIR

0 commit comments

Comments
 (0)