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

PiperOrigin-RevId: 548968754

10 files changed, 70 insertions, 87 deletions

diff --git a/java_src/BUILD.bazel b/java_src/BUILD.bazel
index 03b6fc7cb..c23c622d2 100644
--- a/java_src/BUILD.bazel
+++ b/java_src/BUILD.bazel
@@ -271,7 +271,6 @@ gen_maven_jar_rules(
         "//src/main/java/com/google/crypto/tink/mac:hmac_key",
         "//src/main/java/com/google/crypto/tink/mac:hmac_key_manager",
         "//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_factory",
         "//src/main/java/com/google/crypto/tink/mac:mac_key",
@@ -286,6 +285,7 @@ gen_maven_jar_rules(
         "//src/main/java/com/google/crypto/tink/mac/internal:chunked_hmac_computation",
         "//src/main/java/com/google/crypto/tink/mac/internal:chunked_hmac_impl",
         "//src/main/java/com/google/crypto/tink/mac/internal:chunked_hmac_verification",
+        "//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/monitoring:monitoring_client",
         "//src/main/java/com/google/crypto/tink/monitoring:monitoring_keyset_info",
@@ -699,7 +699,6 @@ gen_maven_jar_rules(
         "//src/main/java/com/google/crypto/tink/mac:hmac_key-android",
         "//src/main/java/com/google/crypto/tink/mac:hmac_key_manager-android",
         "//src/main/java/com/google/crypto/tink/mac:hmac_parameters-android",
-        "//src/main/java/com/google/crypto/tink/mac:hmac_proto_serialization-android",
         "//src/main/java/com/google/crypto/tink/mac:mac_config-android",
         "//src/main/java/com/google/crypto/tink/mac:mac_factory-android",
         "//src/main/java/com/google/crypto/tink/mac:mac_key-android",
@@ -714,6 +713,7 @@ gen_maven_jar_rules(
         "//src/main/java/com/google/crypto/tink/mac/internal:chunked_hmac_computation-android",
         "//src/main/java/com/google/crypto/tink/mac/internal:chunked_hmac_impl-android",
         "//src/main/java/com/google/crypto/tink/mac/internal:chunked_hmac_verification-android",
+        "//src/main/java/com/google/crypto/tink/mac/internal:hmac_proto_serialization-android",
         "//src/main/java/com/google/crypto/tink/monitoring:monitoring_annotations-android",
         "//src/main/java/com/google/crypto/tink/monitoring:monitoring_client-android",
         "//src/main/java/com/google/crypto/tink/monitoring:monitoring_keyset_info-android",
diff --git a/java_src/src/main/java/com/google/crypto/tink/mac/BUILD.bazel b/java_src/src/main/java/com/google/crypto/tink/mac/BUILD.bazel
index 418971613..94ef3db7f 100644
--- a/java_src/src/main/java/com/google/crypto/tink/mac/BUILD.bazel
+++ b/java_src/src/main/java/com/google/crypto/tink/mac/BUILD.bazel
@@ -10,7 +10,6 @@ java_library(
     deps = [
         ":chunked_mac",
         ":hmac_key",
-        ":hmac_proto_serialization",
         "//proto:common_java_proto",
         "//proto:hmac_java_proto",
         "//proto:tink_java_proto",
@@ -23,6 +22,7 @@ java_library(
         "//src/main/java/com/google/crypto/tink/internal:primitive_constructor",
         "//src/main/java/com/google/crypto/tink/internal:primitive_factory",
         "//src/main/java/com/google/crypto/tink/mac/internal:chunked_hmac_impl",
+        "//src/main/java/com/google/crypto/tink/mac/internal:hmac_proto_serialization",
         "//src/main/java/com/google/crypto/tink/subtle:prf_hmac_jce",
         "//src/main/java/com/google/crypto/tink/subtle:prf_mac",
         "//src/main/java/com/google/crypto/tink/subtle:random",
@@ -37,7 +37,6 @@ android_library(
     deps = [
         ":chunked_mac-android",
         ":hmac_key-android",
-        ":hmac_proto_serialization-android",
         "//proto:common_java_proto_lite",
         "//proto:hmac_java_proto_lite",
         "//proto:tink_java_proto_lite",
@@ -50,6 +49,7 @@ android_library(
         "//src/main/java/com/google/crypto/tink/internal:primitive_constructor-android",
         "//src/main/java/com/google/crypto/tink/internal:primitive_factory-android",
         "//src/main/java/com/google/crypto/tink/mac/internal:chunked_hmac_impl-android",
+        "//src/main/java/com/google/crypto/tink/mac/internal:hmac_proto_serialization-android",
         "//src/main/java/com/google/crypto/tink/subtle:prf_hmac_jce-android",
         "//src/main/java/com/google/crypto/tink/subtle:prf_mac-android",
         "//src/main/java/com/google/crypto/tink/subtle:random-android",
@@ -453,58 +453,6 @@ android_library(
 )
 
 java_library(
-    name = "hmac_proto_serialization",
-    srcs = ["HmacProtoSerialization.java"],
-    deps = [
-        ":hmac_key",
-        ":hmac_parameters",
-        "//proto:common_java_proto",
-        "//proto:hmac_java_proto",
-        "//proto:tink_java_proto",
-        "//src/main/java/com/google/crypto/tink:accesses_partial_key",
-        "//src/main/java/com/google/crypto/tink:secret_key_access",
-        "//src/main/java/com/google/crypto/tink/internal:key_parser",
-        "//src/main/java/com/google/crypto/tink/internal:key_serializer",
-        "//src/main/java/com/google/crypto/tink/internal:mutable_serialization_registry",
-        "//src/main/java/com/google/crypto/tink/internal:parameters_parser",
-        "//src/main/java/com/google/crypto/tink/internal:parameters_serializer",
-        "//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:util",
-        "//src/main/java/com/google/crypto/tink/util:bytes",
-        "//src/main/java/com/google/crypto/tink/util:secret_bytes",
-        "@maven//:com_google_code_findbugs_jsr305",
-        "@maven//:com_google_protobuf_protobuf_java",
-    ],
-)
-
-android_library(
-    name = "hmac_proto_serialization-android",
-    srcs = ["HmacProtoSerialization.java"],
-    deps = [
-        ":hmac_key-android",
-        ":hmac_parameters-android",
-        "//proto:common_java_proto_lite",
-        "//proto:hmac_java_proto_lite",
-        "//proto:tink_java_proto_lite",
-        "//src/main/java/com/google/crypto/tink:accesses_partial_key-android",
-        "//src/main/java/com/google/crypto/tink:secret_key_access-android",
-        "//src/main/java/com/google/crypto/tink/internal:key_parser-android",
-        "//src/main/java/com/google/crypto/tink/internal:key_serializer-android",
-        "//src/main/java/com/google/crypto/tink/internal:mutable_serialization_registry-android",
-        "//src/main/java/com/google/crypto/tink/internal:parameters_parser-android",
-        "//src/main/java/com/google/crypto/tink/internal:parameters_serializer-android",
-        "//src/main/java/com/google/crypto/tink/internal:proto_key_serialization-android",
-        "//src/main/java/com/google/crypto/tink/internal:proto_parameters_serialization-android",
-        "//src/main/java/com/google/crypto/tink/internal:util-android",
-        "//src/main/java/com/google/crypto/tink/util:bytes-android",
-        "//src/main/java/com/google/crypto/tink/util:secret_bytes-android",
-        "@maven//:com_google_code_findbugs_jsr305",
-        "@maven//:com_google_protobuf_protobuf_javalite",
-    ],
-)
-
-java_library(
     name = "chunked_mac_wrapper",
     srcs = ["ChunkedMacWrapper.java"],
     deps = [
diff --git a/java_src/src/main/java/com/google/crypto/tink/mac/HmacKeyManager.java b/java_src/src/main/java/com/google/crypto/tink/mac/HmacKeyManager.java
index b439a40e8..451f5c775 100644
--- a/java_src/src/main/java/com/google/crypto/tink/mac/HmacKeyManager.java
+++ b/java_src/src/main/java/com/google/crypto/tink/mac/HmacKeyManager.java
@@ -25,6 +25,7 @@ import com.google.crypto.tink.internal.MutablePrimitiveRegistry;
 import com.google.crypto.tink.internal.PrimitiveConstructor;
 import com.google.crypto.tink.internal.PrimitiveFactory;
 import com.google.crypto.tink.mac.internal.ChunkedHmacImpl;
+import com.google.crypto.tink.mac.internal.HmacProtoSerialization;
 import com.google.crypto.tink.proto.HashType;
 import com.google.crypto.tink.proto.HmacKey;
 import com.google.crypto.tink.proto.HmacKeyFormat;
diff --git a/java_src/src/main/java/com/google/crypto/tink/mac/internal/BUILD.bazel b/java_src/src/main/java/com/google/crypto/tink/mac/internal/BUILD.bazel
index 64f5850aa..3b0aa7b7f 100644
--- a/java_src/src/main/java/com/google/crypto/tink/mac/internal/BUILD.bazel
+++ b/java_src/src/main/java/com/google/crypto/tink/mac/internal/BUILD.bazel
@@ -239,3 +239,55 @@ java_library(
         "@maven//:com_google_code_findbugs_jsr305",
     ],
 )
+
+android_library(
+    name = "hmac_proto_serialization-android",
+    srcs = ["HmacProtoSerialization.java"],
+    deps = [
+        "//proto:common_java_proto_lite",
+        "//proto:hmac_java_proto_lite",
+        "//proto:tink_java_proto_lite",
+        "//src/main/java/com/google/crypto/tink:accesses_partial_key-android",
+        "//src/main/java/com/google/crypto/tink:secret_key_access-android",
+        "//src/main/java/com/google/crypto/tink/internal:key_parser-android",
+        "//src/main/java/com/google/crypto/tink/internal:key_serializer-android",
+        "//src/main/java/com/google/crypto/tink/internal:mutable_serialization_registry-android",
+        "//src/main/java/com/google/crypto/tink/internal:parameters_parser-android",
+        "//src/main/java/com/google/crypto/tink/internal:parameters_serializer-android",
+        "//src/main/java/com/google/crypto/tink/internal:proto_key_serialization-android",
+        "//src/main/java/com/google/crypto/tink/internal:proto_parameters_serialization-android",
+        "//src/main/java/com/google/crypto/tink/internal:util-android",
+        "//src/main/java/com/google/crypto/tink/mac:hmac_key-android",
+        "//src/main/java/com/google/crypto/tink/mac:hmac_parameters-android",
+        "//src/main/java/com/google/crypto/tink/util:bytes-android",
+        "//src/main/java/com/google/crypto/tink/util:secret_bytes-android",
+        "@maven//:com_google_code_findbugs_jsr305",
+        "@maven//:com_google_protobuf_protobuf_javalite",
+    ],
+)
+
+java_library(
+    name = "hmac_proto_serialization",
+    srcs = ["HmacProtoSerialization.java"],
+    deps = [
+        "//proto:common_java_proto",
+        "//proto:hmac_java_proto",
+        "//proto:tink_java_proto",
+        "//src/main/java/com/google/crypto/tink:accesses_partial_key",
+        "//src/main/java/com/google/crypto/tink:secret_key_access",
+        "//src/main/java/com/google/crypto/tink/internal:key_parser",
+        "//src/main/java/com/google/crypto/tink/internal:key_serializer",
+        "//src/main/java/com/google/crypto/tink/internal:mutable_serialization_registry",
+        "//src/main/java/com/google/crypto/tink/internal:parameters_parser",
+        "//src/main/java/com/google/crypto/tink/internal:parameters_serializer",
+        "//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:util",
+        "//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/util:bytes",
+        "//src/main/java/com/google/crypto/tink/util:secret_bytes",
+        "@maven//:com_google_code_findbugs_jsr305",
+        "@maven//:com_google_protobuf_protobuf_java",
+    ],
+)
diff --git a/java_src/src/main/java/com/google/crypto/tink/mac/HmacProtoSerialization.java b/java_src/src/main/java/com/google/crypto/tink/mac/internal/HmacProtoSerialization.java
index 32303a4f9..c537df0c6 100644
--- a/java_src/src/main/java/com/google/crypto/tink/mac/HmacProtoSerialization.java
+++ b/java_src/src/main/java/com/google/crypto/tink/mac/internal/HmacProtoSerialization.java
@@ -14,7 +14,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-package com.google.crypto.tink.mac;
+package com.google.crypto.tink.mac.internal;
 
 import static com.google.crypto.tink.internal.Util.toBytesFromPrintableAscii;
 
@@ -27,6 +27,8 @@ import com.google.crypto.tink.internal.ParametersParser;
 import com.google.crypto.tink.internal.ParametersSerializer;
 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.KeyData.KeyMaterialType;
 import com.google.crypto.tink.proto.KeyTemplate;
@@ -42,7 +44,7 @@ import javax.annotation.Nullable;
 /** Methods to serialize and parse {@link HmacKey} objects and {@link HmacParameters} objects. */
 @AccessesPartialKey
 @SuppressWarnings("UnnecessarilyFullyQualified") // Fully specifying proto types is more readable
-final class HmacProtoSerialization {
+public final class HmacProtoSerialization {
   private static final String TYPE_URL = "type.googleapis.com/google.crypto.tink.HmacKey";
   private static final Bytes TYPE_URL_BYTES = toBytesFromPrintableAscii(TYPE_URL);
 
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;