Skip to content

Commit 1aaa4c5

Browse files
robin-awsseebees
andauthored
feat: AWS KMS multi-Region Key support (#254)
Added new the master key AwsKmsMrkAwareMasterKey and the new master key provider AwsKmsMrkAwareMasterKeyProvider that support AWS KMS multi-Region Keys. See https://docs.aws.amazon.com/kms/latest/developerguide/multi-region-keys-overview.html for more details about AWS KMS multi-Region Keys. See https://docs.aws.amazon.com/encryption-sdk/latest/developer-guide/configure.html#config-mrks for more details about how the AWS Encryption SDK interoperates with AWS KMS multi-Region keys. Co-authored-by: seebees <[email protected]>
1 parent d67fff9 commit 1aaa4c5

File tree

55 files changed

+4915
-133
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+4915
-133
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,7 @@ target/
55
.classpath
66
/bin/
77
.idea/
8-
*.iml
8+
*.iml
9+
/.history
10+
/.DS_Store
11+
/specification_compliance_report.html

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "src/test/resources/aws-encryption-sdk-test-vectors"]
22
path = src/test/resources/aws-encryption-sdk-test-vectors
33
url = https://github.com/awslabs/private-aws-encryption-sdk-test-vectors-staging.git
4+
[submodule "aws-encryption-sdk-specification"]
5+
path = aws-encryption-sdk-specification
6+
url = https://github.com/awslabs/private-aws-encryption-sdk-specification-staging.git

CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,20 @@
11
# Changelog
22

3+
## 2.3.0 -- 2021-06-16
4+
5+
* feat: AWS KMS multi-Region Key support
6+
7+
Added new the master key AwsKmsMrkAwareMasterKey
8+
and the new master key provider AwsKmsMrkAwareMasterKeyProvider
9+
that support AWS KMS multi-Region Keys.
10+
11+
See https://docs.aws.amazon.com/kms/latest/developerguide/multi-region-keys-overview.html
12+
for more details about AWS KMS multi-Region Keys.
13+
14+
See https://docs.aws.amazon.com/encryption-sdk/latest/developer-guide/configure.html#config-mrks
15+
for more details about how the AWS Encryption SDK interoperates
16+
with AWS KMS multi-Region keys.
17+
318
## 2.2.0 -- 2021-05-27
419

520
* feat: Improvements to the message decryption process.

NOTICE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ This software includes third party software subject to the following copyrights:
88
-Cryptographic functions from Bouncy Castle Crypto APIs for Java - Copyright
99
2000-2013 The Legion of the Bouncy Castle
1010

11-
The licenses for these third party components are included in LICENSE.txt
11+
The licenses for these third party components are included in LICENSE.txt

README-JML.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -646,4 +646,4 @@ OpenJML distinguishes between an assertion or specification being found to be in
646646

647647
## Where to Find Java Standard Library Specifications
648648

649-
In the installation of OpenJML, the repo OpenJML/Specs (https://github.com/OpenJML/Specs) is downloaded. This contains specifications for a subset of Java's standard library, following the package structure of the JDK. Any missing specifications could be added into files in the projects contained. Note that the specifications provided for standard library classes and methods are assumed, rather than verified against particular implementations, so any added specifications should be carefully examined so as not to introduce potential unsoundness. If appropriate, additional standard library specifications could be merged into the official release of OpenJML by making a pull request to the development branch of OpenJML/Specs.
649+
In the installation of OpenJML, the repo OpenJML/Specs (https://github.com/OpenJML/Specs) is downloaded. This contains specifications for a subset of Java's standard library, following the package structure of the JDK. Any missing specifications could be added into files in the projects contained. Note that the specifications provided for standard library classes and methods are assumed, rather than verified against particular implementations, so any added specifications should be carefully examined so as not to introduce potential unsoundness. If appropriate, additional standard library specifications could be merged into the official release of OpenJML by making a pull request to the development branch of OpenJML/Specs.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ You can get the latest release from Maven:
5656
<dependency>
5757
<groupId>com.amazonaws</groupId>
5858
<artifactId>aws-encryption-sdk-java</artifactId>
59-
<version>2.2.0</version>
59+
<version>2.3.0</version>
6060
</dependency>
6161
```
6262

codebuild/compliance.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
version: 0.2
2+
3+
phases:
4+
install:
5+
runtime-versions:
6+
nodejs: 12
7+
build:
8+
commands:
9+
- ./util/test-conditions.sh

codebuild/corretto11.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ phases:
66
java: corretto11
77
build:
88
commands:
9-
- mvn install -Dgpg.skip=true "-DtestVectorZip=file://$CODEBUILD_SRC_DIR/src/test/resources/aws-encryption-sdk-test-vectors/vectors/awses-decrypt/python-2.2.0.zip"
9+
- mvn install -Dgpg.skip=true "-DtestVectorZip=file://$CODEBUILD_SRC_DIR/src/test/resources/aws-encryption-sdk-test-vectors/vectors/awses-decrypt/python-2.3.0-mrks.zip"

codebuild/corretto8.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ phases:
66
java: corretto8
77
build:
88
commands:
9-
- mvn install -Dgpg.skip=true "-DtestVectorZip=file://$CODEBUILD_SRC_DIR/src/test/resources/aws-encryption-sdk-test-vectors/vectors/awses-decrypt/python-2.2.0.zip"
9+
- mvn install -Dgpg.skip=true "-DtestVectorZip=file://$CODEBUILD_SRC_DIR/src/test/resources/aws-encryption-sdk-test-vectors/vectors/awses-decrypt/python-2.3.0-mrks.zip"

0 commit comments

Comments
 (0)