commit 97fadb76ab949549665b919094884f29616d52f1
author Juerg Wullschleger <juerg@google.com> Thu Jun 22 03:11:09 2023 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Jun 22 03:12:28 2023 -0700
tree 09b219ea36141759e194de1545f19a13c4d5c675
parent e8da6b60611be23beea2d2cc520565635981bdc9

Replace all usages of Registry.NewKey with Registry.NewKeyData.

This change will allow us to deprecate Registry.NewKey.

PiperOrigin-RevId: 542506814
Change-Id: I0cd9d78adb9a7895350552bce31452e946f7ddce

src/main/java/com/google/crypto/tink/aead/KmsEnvelopeAead.java

diff --git a/src/main/java/com/google/crypto/tink/aead/KmsEnvelopeAead.java b/src/main/java/com/google/crypto/tink/aead/KmsEnvelopeAead.java
index d677e16..de641f4 100644
--- a/src/main/java/com/google/crypto/tink/aead/KmsEnvelopeAead.java
+++ b/src/main/java/com/google/crypto/tink/aead/KmsEnvelopeAead.java
@@ -82,7 +82,7 @@
   public byte[] encrypt(final byte[] plaintext, final byte[] associatedData)
       throws GeneralSecurityException {
     // Generate a new DEK.
-    byte[] dek = Registry.newKey(dekTemplate).toByteArray();
+    byte[] dek = Registry.newKeyData(dekTemplate).getValue().toByteArray();
     // Wrap it with remote.
     byte[] encryptedDek = remote.encrypt(dek, EMPTY_AAD);
     // Use DEK to encrypt plaintext.

src/main/java/com/google/crypto/tink/hybrid/RegistryEciesAeadHkdfDemHelper.java

diff --git a/src/main/java/com/google/crypto/tink/hybrid/RegistryEciesAeadHkdfDemHelper.java b/src/main/java/com/google/crypto/tink/hybrid/RegistryEciesAeadHkdfDemHelper.java
index 7573ba1..7c3e5ab 100644
--- a/src/main/java/com/google/crypto/tink/hybrid/RegistryEciesAeadHkdfDemHelper.java
+++ b/src/main/java/com/google/crypto/tink/hybrid/RegistryEciesAeadHkdfDemHelper.java
@@ -64,7 +64,10 @@
         AesGcmKeyFormat gcmKeyFormat =
             AesGcmKeyFormat.parseFrom(
                 demTemplate.getValue(), ExtensionRegistryLite.getEmptyRegistry());
-        this.aesGcmKey = (AesGcmKey) Registry.newKey(demTemplate);
+        this.aesGcmKey =
+            AesGcmKey.parseFrom(
+                Registry.newKeyData(demTemplate).getValue(),
+                ExtensionRegistryLite.getEmptyRegistry());
         this.symmetricKeySize = gcmKeyFormat.getKeySize();
       } catch (InvalidProtocolBufferException e) {
         throw new GeneralSecurityException(
@@ -75,7 +78,10 @@
         AesCtrHmacAeadKeyFormat aesCtrHmacAeadKeyFormat =
             AesCtrHmacAeadKeyFormat.parseFrom(
                 demTemplate.getValue(), ExtensionRegistryLite.getEmptyRegistry());
-        this.aesCtrHmacAeadKey = (AesCtrHmacAeadKey) Registry.newKey(demTemplate);
+        this.aesCtrHmacAeadKey =
+            AesCtrHmacAeadKey.parseFrom(
+                Registry.newKeyData(demTemplate).getValue(),
+                ExtensionRegistryLite.getEmptyRegistry());
         this.aesCtrKeySize = aesCtrHmacAeadKeyFormat.getAesCtrKeyFormat().getKeySize();
         int hmacKeySize = aesCtrHmacAeadKeyFormat.getHmacKeyFormat().getKeySize();
         this.symmetricKeySize = aesCtrKeySize + hmacKeySize;
@@ -88,7 +94,10 @@
         AesSivKeyFormat aesSivKeyFormat =
             AesSivKeyFormat.parseFrom(
                 demTemplate.getValue(), ExtensionRegistryLite.getEmptyRegistry());
-        this.aesSivKey = (AesSivKey) Registry.newKey(demTemplate);
+        this.aesSivKey =
+            AesSivKey.parseFrom(
+                Registry.newKeyData(demTemplate).getValue(),
+                ExtensionRegistryLite.getEmptyRegistry());
         this.symmetricKeySize = aesSivKeyFormat.getKeySize();
       } catch (InvalidProtocolBufferException e) {
         throw new GeneralSecurityException(