Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/actions/polymorph_codegen/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,11 +116,11 @@ runs:
# run: |
# make polymorph_rust ${{ steps.dependencies.outputs.PROJECT_DEPENDENCIES }}

- name: Regenerate Go code using smithy-dafny
working-directory: ./${{ inputs.library }}
shell: bash
run: |
make polymorph_go
# - name: Regenerate Go code using smithy-dafny
# working-directory: ./${{ inputs.library }}
# shell: bash
# run: |
# make polymorph_go

- name: Check regenerated code against commited code
# Composite action inputs seem to not actually support booleans properly for some reason
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/library_interop_test_vectors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
ubuntu-22.04,
macos-13,
]
language: [java, net, rust, go]
language: [java, net]
# https://taskei.amazon.dev/tasks/CrypTool-5284
dotnet-version: ["6.0.x"]
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -195,8 +195,8 @@ jobs:
ubuntu-22.04,
macos-13,
]
encrypting_language: [java, net, rust, go]
decrypting_language: [java, net, rust, go]
encrypting_language: [java, net]
decrypting_language: [java, net]
# https://taskei.amazon.dev/tasks/CrypTool-5284
dotnet-version: ["6.0.x"]
runs-on: ${{ matrix.os }}
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/pull.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@ jobs:
uses: ./.github/workflows/library_net_tests.yml
with:
dafny: ${{needs.getVersion.outputs.version}}
pr-ci-rust:
needs: getVersion
uses: ./.github/workflows/library_rust_tests.yml
with:
dafny: ${{needs.getVersion.outputs.version}}
pr-ci-go:
needs: getVersion
uses: ./.github/workflows/library_go_tests.yml
with:
dafny: ${{needs.getVersion.outputs.version}}
# pr-ci-rust:
# needs: getVersion
# uses: ./.github/workflows/library_rust_tests.yml
# with:
# dafny: ${{needs.getVersion.outputs.version}}
# pr-ci-go:
# needs: getVersion
# uses: ./.github/workflows/library_go_tests.yml
# with:
# dafny: ${{needs.getVersion.outputs.version}}
pr-test-vectors:
needs: getVersion
uses: ./.github/workflows/library_interop_tests.yml
Expand All @@ -67,7 +67,7 @@ jobs:
- pr-ci-codegen
- pr-ci-verification
- pr-ci-net
- pr-ci-rust
# - pr-ci-rust
- pr-test-vectors
- pr-dafny-test-vectors
- pr-dafny-legacy-test-vectors
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module Fixtures {

const branchKeyStoreName := "KeyStoreDdbTable"
const logicalKeyStoreName := branchKeyStoreName
const branchKeyId := "75789115-1deb-4fe3-a2ec-be9e885d1945"
const branchKeyId := "3f43a9af-08c5-4317-b694-3d3e883dcaef"

// UTF-8 encoded "aws-crypto-"
const RESERVED_ENCRYPTION_CONTEXT: UTF8.ValidUTF8Bytes :=
Expand Down
6 changes: 6 additions & 0 deletions AwsEncryptionSDK/runtimes/net/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## 4.1.1

### Notes

Update .csproj files to prevent use of AWS-SDK-NET V4

## 4.1.0

### Notes
Expand Down
8 changes: 3 additions & 5 deletions AwsEncryptionSDK/runtimes/net/ESDK.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
<IsPackable>true</IsPackable>

<Version>4.1.0</Version>
<Version>4.1.1</Version>

<AssemblyName>AWS.Cryptography.EncryptionSDK</AssemblyName>
<PackageId>AWS.Cryptography.EncryptionSDK</PackageId>
Expand All @@ -30,10 +30,8 @@

<ItemGroup>
<!-- TODO: manually upgraded to match the latest from MPL, is that reasonable? -->
<PackageReference Include="AWSSDK.Core" Version="3.7.*" />
<PackageReference Include="DafnyRuntime" Version="4.9.0" />
<PackageReference Include="BouncyCastle.Cryptography" Version="2.3.1" />
<ProjectReference Include="../../../mpl/AwsCryptographicMaterialProviders/runtimes/net/MPL.csproj" />
<PackageReference Include="DafnyRuntime" Version="[4.9.0]" />
<PackageReference Include="AWS.Cryptography.MaterialProviders" Version="[1.7.6]" />
<!--
System.Collections.Immutable can be removed once dafny.msbuild is updated with
https://github.com/dafny-lang/dafny.msbuild/pull/10 and versioned
Expand Down
1 change: 0 additions & 1 deletion TestVectors/runtimes/java/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,3 @@
*/

rootProject.name = "TestVectors"
include("lib")
2 changes: 1 addition & 1 deletion mpl
Submodule mpl updated from 70e580 to 9ffcf9
2 changes: 1 addition & 1 deletion project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ dafnyVersion=4.9.0
dafnyVerifyVersion=4.9.0
dafnyFormatVersion=4.9.0
projectJavaVersion=4.1.0
mplDependencyJavaVersion=1.9.0-SNAPSHOT
mplDependencyJavaVersion=1.7.6
dafnyRuntimeJavaVersion=4.9.0
smithyDafnyJavaConversionVersion=0.1.1
Loading