Revert "Merge pull request #173 from aws/keyring"

mattsb42-aws · mattsb42-aws · commit 5b3d8efa0070 · 2020-05-21T10:13:23.000-07:00
This reverts commit 015fc3c, reversing changes made to dcbc562.
diff --git a/src/examples/java/com/amazonaws/crypto/examples/EscrowedEncryptExample.java b/src/examples/java/com/amazonaws/crypto/examples/EscrowedEncryptExample.java
@@ -104,7 +104,7 @@ private static void standardEncrypt(final String kmsArn, final String fileName)
     }
 
     private static void standardDecrypt(final String kmsArn, final String fileName) throws Exception {
-        // Decrypt with the KMS CMK and the escrow public key. You can use a combined provider,
+        // Decrypt with the KMS CMK and the escrow public key. You can use a combined provider, 
         // as shown here, or just the KMS master key provider.
 
         // 1. Instantiate the SDK

Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ private static void standardEncrypt(final String kmsArn, final String fileName)`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`private static void standardDecrypt(final String kmsArn, final String fileName) throws Exception {`
`107`		`- // Decrypt with the KMS CMK and the escrow public key. You can use a combined provider,`
	`107`	`+ // Decrypt with the KMS CMK and the escrow public key. You can use a combined provider,`
`108`	`108`	`// as shown here, or just the KMS master key provider.`
`109`	`109`
`110`	`110`	`// 1. Instantiate the SDK`