From 1b6c3baf0b9920acf333ac6b65f8b05b414d1dd5 Mon Sep 17 00:00:00 2001 From: Wesley Rosenblum Date: Mon, 13 Apr 2020 16:36:22 -0700 Subject: [PATCH 1/3] Updating changelog for version 1.7.0 --- CHANGELOG.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1458c3127..e903aae0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,25 @@ # Changelog +## 1.7.0 -- unreleased + +### Deprecation Warnings +* Deprecated `MasterKey` and `MasterKeyProvider`. Replace your usage of these classes with `Keyring`. See `StandardKeyrings` +for the built-in keyrings that replace `KmsMasterKeyProvider`, `JceMasterKey`, and `MultiProviderFactory`. +We still support using master key providers and are not removing them yet. +When we decide to remove them, we will communicate that as defined in our versioning policy. +* Deprecated `encryptData`, `decryptData` and related methods in `AwsCrypto`. Replace your calls to these methods with +calls to `AwsCrypto.encrypt(EncryptRequest)` and `AwsCrypto.decrypt(DecryptRequest)`. + +### Minor Changes +* Introduce `Keyring` interface, built in Keyring implementations, and + methods in AwsCrypto that use keyrings [PR #173](https://github.com/aws/aws-encryption-sdk-java/pull/173) +* Validate final frame length does not exceed the frame size in the message header [PR #166](https://github.com/aws/aws-encryption-sdk-java/pull/166) + +### Maintenance +* Update AWS Java SDK version from 1.11.561 to 1.11.677. [PR #147](https://github.com/aws/aws-encryption-sdk-java/pull/147) +* Upgrade JUnit from 4.12 to 5.5.2 [PR #151](https://github.com/aws/aws-encryption-sdk-java/pull/151) +* Upgrade to Mockito from 2.28.1 to 3.1.0 [PR #142](https://github.com/aws/aws-encryption-sdk-java/pull/142) + ## 1.6.1 -- 2019-10-29 ### Deprecation Warnings From 62b37c9a8c5404e2c8d53ba7d7833d7227bbd9e4 Mon Sep 17 00:00:00 2001 From: Wesley Rosenblum Date: Tue, 14 Apr 2020 19:27:17 -0700 Subject: [PATCH 2/3] Make keyrings a major change --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e903aae0e..66f591b7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,9 +10,11 @@ When we decide to remove them, we will communicate that as defined in our versio * Deprecated `encryptData`, `decryptData` and related methods in `AwsCrypto`. Replace your calls to these methods with calls to `AwsCrypto.encrypt(EncryptRequest)` and `AwsCrypto.decrypt(DecryptRequest)`. -### Minor Changes +### Major Changes * Introduce `Keyring` interface, built in Keyring implementations, and methods in AwsCrypto that use keyrings [PR #173](https://github.com/aws/aws-encryption-sdk-java/pull/173) + +### Patches * Validate final frame length does not exceed the frame size in the message header [PR #166](https://github.com/aws/aws-encryption-sdk-java/pull/166) ### Maintenance From f20b960c115db455e4489ae5f84ccbd4ffd330e3 Mon Sep 17 00:00:00 2001 From: Wesley Rosenblum Date: Tue, 14 Apr 2020 21:07:38 -0700 Subject: [PATCH 3/3] Added documentation update to changelog --- CHANGELOG.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66f591b7c..352b3656e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,8 +20,15 @@ calls to `AwsCrypto.encrypt(EncryptRequest)` and `AwsCrypto.decrypt(DecryptReque ### Maintenance * Update AWS Java SDK version from 1.11.561 to 1.11.677. [PR #147](https://github.com/aws/aws-encryption-sdk-java/pull/147) * Upgrade JUnit from 4.12 to 5.5.2 [PR #151](https://github.com/aws/aws-encryption-sdk-java/pull/151) -* Upgrade to Mockito from 2.28.1 to 3.1.0 [PR #142](https://github.com/aws/aws-encryption-sdk-java/pull/142) - +* Upgrade Mockito from 2.28.1 to 3.1.0 [PR #142](https://github.com/aws/aws-encryption-sdk-java/pull/142) + +### Documentation +* Added new examples demonstrating how to use + APIs, keyrings, cryptographic materials managers, and master key providers. PRs + [#165](https://github.com/aws/aws-encryption-sdk-java/pull/165), + [#168](https://github.com/aws/aws-encryption-sdk-java/pull/168), + and [#170](https://github.com/aws/aws-encryption-sdk-java/pull/170). + ## 1.6.1 -- 2019-10-29 ### Deprecation Warnings