Skip to content

Commit

Permalink
Using original Materials classes instead of new Keyring classes (#152)
Browse files Browse the repository at this point in the history
* Using original Materials classes instead of new Keyring classes

Since the CryptoMaterialsManager interface uses the original
EncryptionMaterials and DecryptionMaterials, we would force customers
to update their code once we deprecate those materials in favor of the
new Keyring versions. To avoid this, Keyrings will now use modified
versions of the original Materials classes, with certain methods
deprecated.

In addition, this commit removed the MasterKeyProviderKeyring, which
was found to not be feasible for the Java ESDK since MasterKeys are
provided in the result object, which would force MasterKeys to be
incorporated into Keyrings.

* Adding back hasCleartextDataKey methods
  • Loading branch information
WesleyRosenblum authored Jan 23, 2020
1 parent a6893b6 commit 1ee9643
Show file tree
Hide file tree
Showing 18 changed files with 561 additions and 1,267 deletions.

This file was deleted.

Loading

0 comments on commit 1ee9643

Please sign in to comment.