diff options
author | tholenst <tholenst@google.com> | 2023-07-03 10:10:11 -0700 |
---|---|---|
committer | Copybara-Service <copybara-worker@google.com> | 2023-07-03 10:11:05 -0700 |
commit | dd96bfa94c05b0146951784cb977906fbf8a03e3 (patch) | |
tree | 3a60cc36d7290f26a45f30df15933dd2a9f30395 /java_src/src/test/java/com/google/crypto/tink | |
parent | 194f8b4d5efdde3803b6033d7e4e091e11055eb9 (diff) | |
download | tink-dd96bfa94c05b0146951784cb977906fbf8a03e3.tar.gz |
Move the PrfBasedKeyDerivationKeyProtoSerialization to Internal.
This will be called from the keymanager which is internal. Hence it has to be internal.
PiperOrigin-RevId: 545244314
Diffstat (limited to 'java_src/src/test/java/com/google/crypto/tink')
-rw-r--r-- | java_src/src/test/java/com/google/crypto/tink/keyderivation/BUILD.bazel | 33 | ||||
-rw-r--r-- | java_src/src/test/java/com/google/crypto/tink/keyderivation/internal/BUILD.bazel | 33 | ||||
-rw-r--r-- | java_src/src/test/java/com/google/crypto/tink/keyderivation/internal/PrfBasedKeyDerivationKeyProtoSerializationTest.java (renamed from java_src/src/test/java/com/google/crypto/tink/keyderivation/PrfBasedKeyDerivationKeyProtoSerializationTest.java) | 4 |
3 files changed, 36 insertions, 34 deletions
diff --git a/java_src/src/test/java/com/google/crypto/tink/keyderivation/BUILD.bazel b/java_src/src/test/java/com/google/crypto/tink/keyderivation/BUILD.bazel index c18bcf36c..f36fff694 100644 --- a/java_src/src/test/java/com/google/crypto/tink/keyderivation/BUILD.bazel +++ b/java_src/src/test/java/com/google/crypto/tink/keyderivation/BUILD.bazel @@ -115,36 +115,3 @@ java_test( "@maven//:junit_junit", ], ) - -java_test( - name = "PrfBasedKeyDerivationKeyProtoSerializationTest", - size = "small", - srcs = ["PrfBasedKeyDerivationKeyProtoSerializationTest.java"], - deps = [ - "//proto:aes_cmac_prf_java_proto", - "//proto:prf_based_deriver_java_proto", - "//proto:tink_java_proto", - "//proto:xchacha20_poly1305_java_proto", - "//src/main/java/com/google/crypto/tink:insecure_secret_key_access", - "//src/main/java/com/google/crypto/tink:key", - "//src/main/java/com/google/crypto/tink:parameters", - "//src/main/java/com/google/crypto/tink/aead:aead_config", - "//src/main/java/com/google/crypto/tink/aead:x_cha_cha20_poly1305_parameters", - "//src/main/java/com/google/crypto/tink/internal:mutable_serialization_registry", - "//src/main/java/com/google/crypto/tink/internal:proto_key_serialization", - "//src/main/java/com/google/crypto/tink/internal:proto_parameters_serialization", - "//src/main/java/com/google/crypto/tink/internal:tink_bug_exception", - "//src/main/java/com/google/crypto/tink/internal/testing:asserts", - "//src/main/java/com/google/crypto/tink/keyderivation:prf_based_key_derivation_key", - "//src/main/java/com/google/crypto/tink/keyderivation:prf_based_key_derivation_key_proto_serialization", - "//src/main/java/com/google/crypto/tink/keyderivation:prf_based_key_derivation_parameters", - "//src/main/java/com/google/crypto/tink/prf:aes_cmac_prf_key", - "//src/main/java/com/google/crypto/tink/prf:aes_cmac_prf_parameters", - "//src/main/java/com/google/crypto/tink/prf:prf_config", - "//src/main/java/com/google/crypto/tink/prf:prf_parameters", - "//src/main/java/com/google/crypto/tink/util:secret_bytes", - "@maven//:com_google_protobuf_protobuf_java", - "@maven//:com_google_truth_truth", - "@maven//:junit_junit", - ], -) diff --git a/java_src/src/test/java/com/google/crypto/tink/keyderivation/internal/BUILD.bazel b/java_src/src/test/java/com/google/crypto/tink/keyderivation/internal/BUILD.bazel index 89161424e..12afbd8b6 100644 --- a/java_src/src/test/java/com/google/crypto/tink/keyderivation/internal/BUILD.bazel +++ b/java_src/src/test/java/com/google/crypto/tink/keyderivation/internal/BUILD.bazel @@ -52,3 +52,36 @@ java_test( "@maven//:junit_junit", ], ) + +java_test( + name = "PrfBasedKeyDerivationKeyProtoSerializationTest", + size = "small", + srcs = ["PrfBasedKeyDerivationKeyProtoSerializationTest.java"], + deps = [ + "//proto:aes_cmac_prf_java_proto", + "//proto:prf_based_deriver_java_proto", + "//proto:tink_java_proto", + "//proto:xchacha20_poly1305_java_proto", + "//src/main/java/com/google/crypto/tink:insecure_secret_key_access", + "//src/main/java/com/google/crypto/tink:key", + "//src/main/java/com/google/crypto/tink:parameters", + "//src/main/java/com/google/crypto/tink/aead:aead_config", + "//src/main/java/com/google/crypto/tink/aead:x_cha_cha20_poly1305_parameters", + "//src/main/java/com/google/crypto/tink/internal:mutable_serialization_registry", + "//src/main/java/com/google/crypto/tink/internal:proto_key_serialization", + "//src/main/java/com/google/crypto/tink/internal:proto_parameters_serialization", + "//src/main/java/com/google/crypto/tink/internal:tink_bug_exception", + "//src/main/java/com/google/crypto/tink/internal/testing:asserts", + "//src/main/java/com/google/crypto/tink/keyderivation:prf_based_key_derivation_key", + "//src/main/java/com/google/crypto/tink/keyderivation:prf_based_key_derivation_parameters", + "//src/main/java/com/google/crypto/tink/keyderivation/internal:prf_based_key_derivation_key_proto_serialization", + "//src/main/java/com/google/crypto/tink/prf:aes_cmac_prf_key", + "//src/main/java/com/google/crypto/tink/prf:aes_cmac_prf_parameters", + "//src/main/java/com/google/crypto/tink/prf:prf_config", + "//src/main/java/com/google/crypto/tink/prf:prf_parameters", + "//src/main/java/com/google/crypto/tink/util:secret_bytes", + "@maven//:com_google_protobuf_protobuf_java", + "@maven//:com_google_truth_truth", + "@maven//:junit_junit", + ], +) diff --git a/java_src/src/test/java/com/google/crypto/tink/keyderivation/PrfBasedKeyDerivationKeyProtoSerializationTest.java b/java_src/src/test/java/com/google/crypto/tink/keyderivation/internal/PrfBasedKeyDerivationKeyProtoSerializationTest.java index 61c2f64d7..dbad6a3da 100644 --- a/java_src/src/test/java/com/google/crypto/tink/keyderivation/PrfBasedKeyDerivationKeyProtoSerializationTest.java +++ b/java_src/src/test/java/com/google/crypto/tink/keyderivation/internal/PrfBasedKeyDerivationKeyProtoSerializationTest.java @@ -14,7 +14,7 @@ // //////////////////////////////////////////////////////////////////////////////// -package com.google.crypto.tink.keyderivation; +package com.google.crypto.tink.keyderivation.internal; import static com.google.common.truth.Truth.assertThat; import static com.google.crypto.tink.internal.TinkBugException.exceptionIsBug; @@ -29,6 +29,8 @@ import com.google.crypto.tink.aead.XChaCha20Poly1305Parameters; import com.google.crypto.tink.internal.MutableSerializationRegistry; import com.google.crypto.tink.internal.ProtoKeySerialization; import com.google.crypto.tink.internal.ProtoParametersSerialization; +import com.google.crypto.tink.keyderivation.PrfBasedKeyDerivationKey; +import com.google.crypto.tink.keyderivation.PrfBasedKeyDerivationParameters; import com.google.crypto.tink.prf.AesCmacPrfKey; import com.google.crypto.tink.prf.AesCmacPrfParameters; import com.google.crypto.tink.prf.PrfConfig; |