diff options
| author | tholenst <tholenst@google.com> | 2023-07-07 07:23:58 -0700 |
|---|---|---|
| committer | Copybara-Service <copybara-worker@google.com> | 2023-07-07 07:24:55 -0700 |
| commit | a6f2fd3f6da4f0ca91ee9fa62d0dbddef5fc5dca (patch) | |
| tree | 5aadc19d7826c5f591aa3d75fe37f40f6eb533e5 /java_src | |
| parent | fbd77e2d296a2dc126b3ff6ff1acf004fe46ed63 (diff) | |
| download | tink-a6f2fd3f6da4f0ca91ee9fa62d0dbddef5fc5dca.tar.gz | |
Register the PrfBasedDeriver protoserialization.
Note: in the KeyDerivationKeyTemplatesTest we need to remove the "LEGACY" test case since when deserializaing this and serializing it again it may change to "CRUNCHY".
PiperOrigin-RevId: 546274713
Diffstat (limited to 'java_src')
3 files changed, 3 insertions, 1 deletions
diff --git a/java_src/src/main/java/com/google/crypto/tink/keyderivation/internal/BUILD.bazel b/java_src/src/main/java/com/google/crypto/tink/keyderivation/internal/BUILD.bazel index 9fbdf5af7..704b45c3c 100644 --- a/java_src/src/main/java/com/google/crypto/tink/keyderivation/internal/BUILD.bazel +++ b/java_src/src/main/java/com/google/crypto/tink/keyderivation/internal/BUILD.bazel @@ -43,6 +43,7 @@ java_library( srcs = ["PrfBasedDeriverKeyManager.java"], deps = [ ":prf_based_deriver", + ":prf_based_key_derivation_key_proto_serialization", "//proto:prf_based_deriver_java_proto", "//proto:tink_java_proto", "//src/main/java/com/google/crypto/tink:registry", @@ -59,6 +60,7 @@ android_library( srcs = ["PrfBasedDeriverKeyManager.java"], deps = [ ":prf_based_deriver-android", + ":prf_based_key_derivation_key_proto_serialization-android", "//proto:prf_based_deriver_java_proto_lite", "//proto:tink_java_proto_lite", "//src/main/java/com/google/crypto/tink:registry-android", diff --git a/java_src/src/main/java/com/google/crypto/tink/keyderivation/internal/PrfBasedDeriverKeyManager.java b/java_src/src/main/java/com/google/crypto/tink/keyderivation/internal/PrfBasedDeriverKeyManager.java index c06024ee2..c27028c20 100644 --- a/java_src/src/main/java/com/google/crypto/tink/keyderivation/internal/PrfBasedDeriverKeyManager.java +++ b/java_src/src/main/java/com/google/crypto/tink/keyderivation/internal/PrfBasedDeriverKeyManager.java @@ -115,5 +115,6 @@ public final class PrfBasedDeriverKeyManager extends KeyTypeManager<PrfBasedDeri public static void register(boolean newKeyAllowed) throws GeneralSecurityException { Registry.registerKeyManager(new PrfBasedDeriverKeyManager(), newKeyAllowed); + PrfBasedKeyDerivationKeyProtoSerialization.register(); } } diff --git a/java_src/src/test/java/com/google/crypto/tink/keyderivation/KeyDerivationKeyTemplatesTest.java b/java_src/src/test/java/com/google/crypto/tink/keyderivation/KeyDerivationKeyTemplatesTest.java index 64cc76647..fe4ef7d86 100644 --- a/java_src/src/test/java/com/google/crypto/tink/keyderivation/KeyDerivationKeyTemplatesTest.java +++ b/java_src/src/test/java/com/google/crypto/tink/keyderivation/KeyDerivationKeyTemplatesTest.java @@ -57,7 +57,6 @@ public final class KeyDerivationKeyTemplatesTest { List<OutputPrefixType> outputPrefixTypes = new ArrayList<>(); outputPrefixTypes.add(OutputPrefixType.TINK); - outputPrefixTypes.add(OutputPrefixType.LEGACY); outputPrefixTypes.add(OutputPrefixType.RAW); outputPrefixTypes.add(OutputPrefixType.CRUNCHY); |