Skip to content

chore: Run raw keyring test for transitional version #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kessplas merged 4 commits into from
Nov 11, 2025
Merged

chore: Run raw keyring test for transitional version #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d25d33e
auto commit
rishav-karanjit Nov 11, 2025
cbae722
auto commit
rishav-karanjit Nov 11, 2025
fd4c51f
Merge branch 'fireegg-test-servers' into runRawKeyringTest
rishav-karanjit Nov 11, 2025
8664a2c
Merge branch 'fireegg-test-servers' into runRawKeyringTest
kessplas Nov 11, 2025
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
3 changes: 1 addition & 2 deletions test-server/java-tests/src/it/java/software/amazon/encryption/s3/TestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,7 @@ public class TestUtils {
// For now, only .NET and Java have RSA support
public static final Set<String> RAW_SUPPORTED =
Set.of(JAVA_V3_CURRENT, JAVA_V3_TRANSITION, JAVA_V4
, NET_V2_CURRENT, NET_V3_CURRENT
// , NET_V3_TRANSITION
, NET_V2_CURRENT, NET_V3_CURRENT, NET_V3_TRANSITION
);

// .NET only supports decrypting instruction files using AES and RSA.
Expand Down
2 changes: 1 addition & 1 deletion test-server/net-v3-transition-server/Models/ClientRequest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class KeyMaterial
{
public byte[]? RsaKey { get; set; }
public byte[]? AesKey { get; set; }
public string KmsKeyId { get; set; }
public string? KmsKeyId { get; set; }
}

[JsonConverter(typeof(JsonStringEnumConverter))]
Expand Down
Loading