Skip to content
Draft
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
4 changes: 2 additions & 2 deletions test-server/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ PID_FILE := .server.pid
LOG_FILE := .server.log

# Bootstrap-then-delegate coordinates for `make test-server`. The commons
# repository coordinates live in commons-configuration.json next to this
# repository coordinates live in server-config.json next to this
# Makefile; COMMONS_BRANCH overrides the configured branch at invocation time.
MAKEFILE_DIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
REPO_ROOT := $(abspath $(MAKEFILE_DIR)/..)
COMMONS_CONFIGURATION := $(MAKEFILE_DIR)/commons-configuration.json
COMMONS_CONFIGURATION := $(MAKEFILE_DIR)/server-config.json
COMMONS_BRANCH ?=
CLONE_DIR ?= $(MAKEFILE_DIR)/.commons-clone
CLONE_ORCH_DIR := $(CLONE_DIR)/esdk/test-server/orchestrator
Expand Down
7 changes: 7 additions & 0 deletions test-server/bug-config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[
"decrypt-accepts-trailing-bytes-commit-key",
"create-client-accepts-reserved-aws-kms-namespace",
"encrypt-accepts-reserved-prefix-encryption-context-key",
"encrypt-mishandles-proto-encryption-context-key",
"default-cmm-ignores-reproduced-only-encryption-context"
]
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
{
"commonsRepository": {
"name": "aws-crypto-tools-commons",
"url": "git@github.com:aws/aws-crypto-tools-commons.git",
"branch": "lucmcdon/esdk-test-server-all-languages"
},
"product": "esdk",
"supportedFeatures": [
"streaming",
"hierarchical",
Expand Down
8 changes: 8 additions & 0 deletions test-server/server-config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"commonsRepository": {
"name": "aws-crypto-tools-commons",
"url": "git@github.com:aws/aws-crypto-tools-commons.git",
"branch": "lucmcdon/esdk-test-server-all-languages"
},
"product": "esdk"
}
4 changes: 4 additions & 0 deletions test-server/src/bridge.ts
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,10 @@ function buildRawAes(config: RawAesKeyringConfig): KeyringNode {
* into the request body. */
unencryptedMasterKey: new Uint8Array(config.wrappingKey),
wrappingSuite,
/* Sort the encryption context by UTF-8 bytes in the wrapping AAD, as the
* other ESDK implementations do. The keyring defaults to the older
* locale order. */
utf8Sorting: true,
})
}

Expand Down
Loading