Move HmacProtoSerialization into internal/. This needs to be accessible from a keymanager that is internal.

PiperOrigin-RevId: 548968754

5 files changed, 9 insertions, 29 deletions

diff --git a/java_src/src/test/java/com/google/crypto/tink/mac/BUILD.bazel b/java_src/src/test/java/com/google/crypto/tink/mac/BUILD.bazel
index a6951af06..8cbf9ffb9 100644
--- a/java_src/src/test/java/com/google/crypto/tink/mac/BUILD.bazel
+++ b/java_src/src/test/java/com/google/crypto/tink/mac/BUILD.bazel
@@ -130,9 +130,9 @@ java_test(
         "//src/main/java/com/google/crypto/tink/mac:aes_cmac_proto_serialization",
         "//src/main/java/com/google/crypto/tink/mac:hmac_key",
         "//src/main/java/com/google/crypto/tink/mac:hmac_parameters",
-        "//src/main/java/com/google/crypto/tink/mac:hmac_proto_serialization",
         "//src/main/java/com/google/crypto/tink/mac:mac_config",
         "//src/main/java/com/google/crypto/tink/mac:mac_wrapper",
+        "//src/main/java/com/google/crypto/tink/mac/internal:hmac_proto_serialization",
         "//src/main/java/com/google/crypto/tink/monitoring:monitoring_annotations",
         "//src/main/java/com/google/crypto/tink/subtle:hex",
         "//src/main/java/com/google/crypto/tink/subtle:random",
@@ -252,31 +252,6 @@ java_test(
 )
 
 java_test(
-    name = "HmacProtoSerializationTest",
-    size = "small",
-    srcs = ["HmacProtoSerializationTest.java"],
-    deps = [
-        "//proto:common_java_proto",
-        "//proto:hmac_java_proto",
-        "//proto:tink_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/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/testing:asserts",
-        "//src/main/java/com/google/crypto/tink/mac:hmac_key",
-        "//src/main/java/com/google/crypto/tink/mac:hmac_parameters",
-        "//src/main/java/com/google/crypto/tink/mac:hmac_proto_serialization",
-        "//src/main/java/com/google/crypto/tink/util:secret_bytes",
-        "@maven//:com_google_protobuf_protobuf_java",
-        "@maven//:com_google_truth_truth",
-        "@maven//:junit_junit",
-    ],
-)
-
-java_test(
     name = "ChunkedMacWrapperTest",
     size = "small",
     srcs = ["ChunkedMacWrapperTest.java"],
@@ -292,8 +267,8 @@ java_test(
         "//src/main/java/com/google/crypto/tink/mac:chunked_mac_wrapper",
         "//src/main/java/com/google/crypto/tink/mac:hmac_key",
         "//src/main/java/com/google/crypto/tink/mac:hmac_parameters",
-        "//src/main/java/com/google/crypto/tink/mac:hmac_proto_serialization",
         "//src/main/java/com/google/crypto/tink/mac:mac_config",
+        "//src/main/java/com/google/crypto/tink/mac/internal:hmac_proto_serialization",
         "//src/main/java/com/google/crypto/tink/subtle:hex",
         "//src/main/java/com/google/crypto/tink/util:secret_bytes",
         "@maven//:com_google_truth_truth",
@@ -318,8 +293,8 @@ java_test(
         "//src/main/java/com/google/crypto/tink/mac:chunked_mac_wrapper",
         "//src/main/java/com/google/crypto/tink/mac:hmac_key",
         "//src/main/java/com/google/crypto/tink/mac:hmac_parameters",
-        "//src/main/java/com/google/crypto/tink/mac:hmac_proto_serialization",
         "//src/main/java/com/google/crypto/tink/mac:mac_config",
+        "//src/main/java/com/google/crypto/tink/mac/internal:hmac_proto_serialization",
         "//src/main/java/com/google/crypto/tink/util:secret_bytes",
         "@maven//:junit_junit",
     ],
diff --git a/java_src/src/test/java/com/google/crypto/tink/mac/ChunkedMacTest.java b/java_src/src/test/java/com/google/crypto/tink/mac/ChunkedMacTest.java
index 440d4c84b..4831eb835 100644
--- a/java_src/src/test/java/com/google/crypto/tink/mac/ChunkedMacTest.java
+++ b/java_src/src/test/java/com/google/crypto/tink/mac/ChunkedMacTest.java
@@ -23,6 +23,7 @@ import com.google.crypto.tink.KeysetHandle;
 import com.google.crypto.tink.Mac;
 import com.google.crypto.tink.mac.AesCmacParameters.Variant;
 import com.google.crypto.tink.mac.HmacParameters.HashType;
+import com.google.crypto.tink.mac.internal.HmacProtoSerialization;
 import com.google.crypto.tink.util.SecretBytes;
 import java.nio.ByteBuffer;
 import java.security.GeneralSecurityException;
diff --git a/java_src/src/test/java/com/google/crypto/tink/mac/ChunkedMacWrapperTest.java b/java_src/src/test/java/com/google/crypto/tink/mac/ChunkedMacWrapperTest.java
index a95161dce..586fc7596 100644
--- a/java_src/src/test/java/com/google/crypto/tink/mac/ChunkedMacWrapperTest.java
+++ b/java_src/src/test/java/com/google/crypto/tink/mac/ChunkedMacWrapperTest.java
@@ -24,6 +24,7 @@ import com.google.crypto.tink.InsecureSecretKeyAccess;
 import com.google.crypto.tink.KeysetHandle;
 import com.google.crypto.tink.mac.AesCmacParameters.Variant;
 import com.google.crypto.tink.mac.HmacParameters.HashType;
+import com.google.crypto.tink.mac.internal.HmacProtoSerialization;
 import com.google.crypto.tink.subtle.Hex;
 import com.google.crypto.tink.util.SecretBytes;
 import java.nio.ByteBuffer;
diff --git a/java_src/src/test/java/com/google/crypto/tink/mac/MacWrapperTest.java b/java_src/src/test/java/com/google/crypto/tink/mac/MacWrapperTest.java
index ac94a8e0e..a60dce6cb 100644
--- a/java_src/src/test/java/com/google/crypto/tink/mac/MacWrapperTest.java
+++ b/java_src/src/test/java/com/google/crypto/tink/mac/MacWrapperTest.java
@@ -27,6 +27,7 @@ import com.google.crypto.tink.PrimitiveSet;
 import com.google.crypto.tink.internal.MutableMonitoringRegistry;
 import com.google.crypto.tink.internal.testing.FakeMonitoringClient;
 import com.google.crypto.tink.mac.HmacParameters.HashType;
+import com.google.crypto.tink.mac.internal.HmacProtoSerialization;
 import com.google.crypto.tink.monitoring.MonitoringAnnotations;
 import com.google.crypto.tink.proto.KeyStatusType;
 import com.google.crypto.tink.proto.Keyset.Key;
diff --git a/java_src/src/test/java/com/google/crypto/tink/mac/HmacProtoSerializationTest.java b/java_src/src/test/java/com/google/crypto/tink/mac/internal/HmacProtoSerializationTest.java
index 64dd65f81..4cf269059 100644
--- a/java_src/src/test/java/com/google/crypto/tink/mac/HmacProtoSerializationTest.java
+++ b/java_src/src/test/java/com/google/crypto/tink/mac/internal/HmacProtoSerializationTest.java
@@ -14,7 +14,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-package com.google.crypto.tink.mac;
+package com.google.crypto.tink.mac.internal;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.crypto.tink.internal.testing.Asserts.assertEqualWhenValueParsed;
@@ -26,6 +26,8 @@ import com.google.crypto.tink.Parameters;
 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.mac.HmacKey;
+import com.google.crypto.tink.mac.HmacParameters;
 import com.google.crypto.tink.proto.HashType;
 import com.google.crypto.tink.proto.HmacParams;
 import com.google.crypto.tink.proto.KeyData.KeyMaterialType;