Don't register KMS client in Encrypted Keyset example in Java.

Also, I switched some ".equals" expressions around. PiperOrigin-RevId: 560615476 Change-Id: I1898cb7553d573f7e48051a98c5fa5fc02c6a242
tink-crypto · Aug 28, 2023 · 025cd27 · 025cd27
1 parent f38d77e
commit 025cd27
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/examples/encryptedkeyset/BUILD.bazel b/examples/encryptedkeyset/BUILD.bazel
@@ -12,7 +12,6 @@ java_binary(
         "@tink_java//src/main/java/com/google/crypto/tink:registry_cluster",
         "@tink_java//src/main/java/com/google/crypto/tink:tink_json_proto_keyset_format",
         "@tink_java//src/main/java/com/google/crypto/tink/aead:aead_config",
-        "@tink_java//src/main/java/com/google/crypto/tink/aead:kms_aead_key_manager",
         "@tink_java//src/main/java/com/google/crypto/tink/aead:predefined_aead_parameters",
         "@tink_java_gcpkms//src/main/java/com/google/crypto/tink/integration/gcpkms:gcp_kms_client",
     ],

diff --git a/examples/encryptedkeyset/EncryptedKeysetExample.java b/examples/encryptedkeyset/EncryptedKeysetExample.java
@@ -20,13 +20,11 @@
 import com.google.crypto.tink.KeysetHandle;
 import com.google.crypto.tink.TinkJsonProtoKeysetFormat;
 import com.google.crypto.tink.aead.AeadConfig;
-import com.google.crypto.tink.aead.KmsAeadKeyManager;
 import com.google.crypto.tink.aead.PredefinedAeadParameters;
 import com.google.crypto.tink.integration.gcpkms.GcpKmsClient;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.Optional;
 
 /**
  * A command-line utility for working with encrypted keysets.
@@ -58,7 +56,7 @@ public static void main(String[] args) throws Exception {
       System.exit(1);
     }
     String mode = args[0];
-    if (!MODE_ENCRYPT.equals(mode) && !MODE_DECRYPT.equals(mode) && !MODE_GENERATE.equals(mode)) {
+    if (!mode.equals(MODE_ENCRYPT) && !mode.equals(MODE_DECRYPT) && !mode.equals(MODE_GENERATE)) {
       System.err.print("The first argument should be either encrypt, decrypt or generate");
       System.exit(1);
     }
@@ -69,15 +67,11 @@ public static void main(String[] args) throws Exception {
     // Initialise Tink: register all AEAD key types with the Tink runtime
     AeadConfig.register();
 
-    // Read the GCP credentials and set up client
-    GcpKmsClient.register(Optional.of(kekUri), Optional.of(gcpCredentialFilename));
-
     // From the key-encryption key (KEK) URI, create a remote AEAD primitive for encrypting Tink
     // keysets.
-    KeysetHandle kekHandle = KeysetHandle.generateNew(KmsAeadKeyManager.createKeyTemplate(kekUri));
-    Aead kekAead = kekHandle.getPrimitive(Aead.class);
+    Aead kekAead = new GcpKmsClient().withCredentials(gcpCredentialFilename).getAead(kekUri);
 
-    if (MODE_GENERATE.equals(mode)) {
+    if (mode.equals(MODE_GENERATE)) {
       // [START generate-a-new-keyset]
       KeysetHandle handle = KeysetHandle.generateNew(PredefinedAeadParameters.AES128_GCM);
       // [END generate-a-new-keyset]
@@ -104,11 +98,11 @@ public static void main(String[] args) throws Exception {
     Path inputFile = Paths.get(args[4]);
     Path outputFile = Paths.get(args[5]);
 
-    if (MODE_ENCRYPT.equals(mode)) {
+    if (mode.equals(MODE_ENCRYPT)) {
       byte[] plaintext = Files.readAllBytes(inputFile);
       byte[] ciphertext = aead.encrypt(plaintext, EMPTY_ASSOCIATED_DATA);
       Files.write(outputFile, ciphertext);
-    } else if (MODE_DECRYPT.equals(mode)) {
+    } else if (mode.equals(MODE_DECRYPT)) {
       byte[] ciphertext = Files.readAllBytes(inputFile);
       byte[] plaintext = aead.decrypt(ciphertext, EMPTY_ASSOCIATED_DATA);
       Files.write(outputFile, plaintext);