Code

Merge head of master into keyring#169

Code

Merged

WesleyRosenblum merged 6 commits intokeyringaws/aws-encryption-sdk-java:keyringfrom

master-keyring-mergeaws/aws-encryption-sdk-java:master-keyring-mergeCopy head branch name to clipboard

Apr 7, 2020

Commits

Commits on Oct 29, 2019

• Add a basic example for encrypting and decrypting with a KMS CMK (#136)

  Show description for 04423a3
  

  WesleyRosenblum

  authored and

  mattsb42-aws

  committed
  04423a3

  Copy full SHA for 04423a3

• Update docs in prep for 1.6.1 (#133)

  Show description for 74c85cb
  SalusaSecondus

  authored
  74c85cb

  Copy full SHA for 74c85cb

• Fix for new versions of gpg

  SalusaSecondus

  committed
  47fe973

  Copy full SHA for 47fe973

Commits on Nov 8, 2019

• Refactor JceMasterKey to extract logic to be shared by raw keyrings. (#139)

  Show description for 4fdc309
  WesleyRosenblum

  authored
  4fdc309

  Copy full SHA for 4fdc309

Commits on Apr 7, 2020

• fix: The final frame can not be larger than the Frame Length (#166)

  Show description for dcbc562
  WesleyRosenblum

  authored
  dcbc562

  Copy full SHA for dcbc562

• Merge branch 'master' into master-keyring-merge

  WesleyRosenblum

  committed
  58b7bbf

  Copy full SHA for 58b7bbf