Move Ed25519ProtoSerialization and AesCtrHmacStreamingProtoSerialization into internal/ and make it public for the use in test for future ConfigurationV0.

PiperOrigin-RevId: 615017125

Author: LizaTretyakova

java_src/BUILD.bazel

@@ -342,7 +342,6 @@ gen_maven_jar_rules(
         "//src/main/java/com/google/crypto/tink/signature:ed25519_parameters",
         "//src/main/java/com/google/crypto/tink/signature:ed25519_private_key",
         "//src/main/java/com/google/crypto/tink/signature:ed25519_private_key_manager",
-        "//src/main/java/com/google/crypto/tink/signature:ed25519_proto_serialization",
         "//src/main/java/com/google/crypto/tink/signature:ed25519_public_key",
         "//src/main/java/com/google/crypto/tink/signature:ed25519_public_key_manager",
         "//src/main/java/com/google/crypto/tink/signature:predefined_signature_parameters",
@@ -369,6 +368,7 @@ gen_maven_jar_rules(
         "//src/main/java/com/google/crypto/tink/signature:signature_private_key",
         "//src/main/java/com/google/crypto/tink/signature:signature_public_key",
         "//src/main/java/com/google/crypto/tink/signature/internal:ecdsa_proto_serialization",
+        "//src/main/java/com/google/crypto/tink/signature/internal:ed25519_proto_serialization",
         "//src/main/java/com/google/crypto/tink/signature/internal:legacy_full_sign",
         "//src/main/java/com/google/crypto/tink/signature/internal:legacy_full_verify",
         "//src/main/java/com/google/crypto/tink/signature/internal:rsa_ssa_pkcs1_proto_serialization",
@@ -377,7 +377,6 @@ gen_maven_jar_rules(
         "//src/main/java/com/google/crypto/tink/streamingaead:aes_ctr_hmac_streaming_key",
         "//src/main/java/com/google/crypto/tink/streamingaead:aes_ctr_hmac_streaming_key_manager",
         "//src/main/java/com/google/crypto/tink/streamingaead:aes_ctr_hmac_streaming_parameters",
-        "//src/main/java/com/google/crypto/tink/streamingaead:aes_ctr_hmac_streaming_proto_serialization",
         "//src/main/java/com/google/crypto/tink/streamingaead:aes_gcm_hkdf_streaming_key",
         "//src/main/java/com/google/crypto/tink/streamingaead:aes_gcm_hkdf_streaming_key_manager",
         "//src/main/java/com/google/crypto/tink/streamingaead:aes_gcm_hkdf_streaming_parameters",
@@ -393,6 +392,7 @@ gen_maven_jar_rules(
         "//src/main/java/com/google/crypto/tink/streamingaead:streaming_aead_parameters",
         "//src/main/java/com/google/crypto/tink/streamingaead:streaming_aead_util",
         "//src/main/java/com/google/crypto/tink/streamingaead:streaming_aead_wrapper",
+        "//src/main/java/com/google/crypto/tink/streamingaead/internal:aes_ctr_hmac_streaming_proto_serialization",
         "//src/main/java/com/google/crypto/tink/streamingaead/internal:aes_gcm_hkdf_streaming_proto_serialization",
         "//src/main/java/com/google/crypto/tink/streamingaead/internal:legacy_full_streaming_aead",
         "//src/main/java/com/google/crypto/tink/subtle:aes_ctr_hmac_streaming",
@@ -799,7 +799,6 @@ gen_maven_jar_rules(
         "//src/main/java/com/google/crypto/tink/signature:ed25519_parameters-android",
         "//src/main/java/com/google/crypto/tink/signature:ed25519_private_key-android",
         "//src/main/java/com/google/crypto/tink/signature:ed25519_private_key_manager-android",
-        "//src/main/java/com/google/crypto/tink/signature:ed25519_proto_serialization-android",
         "//src/main/java/com/google/crypto/tink/signature:ed25519_public_key-android",
         "//src/main/java/com/google/crypto/tink/signature:ed25519_public_key_manager-android",
         "//src/main/java/com/google/crypto/tink/signature:predefined_signature_parameters-android",
@@ -826,6 +825,7 @@ gen_maven_jar_rules(
         "//src/main/java/com/google/crypto/tink/signature:signature_private_key-android",
         "//src/main/java/com/google/crypto/tink/signature:signature_public_key-android",
         "//src/main/java/com/google/crypto/tink/signature/internal:ecdsa_proto_serialization-android",
+        "//src/main/java/com/google/crypto/tink/signature/internal:ed25519_proto_serialization-android",
         "//src/main/java/com/google/crypto/tink/signature/internal:legacy_full_sign-android",
         "//src/main/java/com/google/crypto/tink/signature/internal:legacy_full_verify-android",
         "//src/main/java/com/google/crypto/tink/signature/internal:rsa_ssa_pkcs1_proto_serialization-android",
@@ -834,7 +834,6 @@ gen_maven_jar_rules(
         "//src/main/java/com/google/crypto/tink/streamingaead:aes_ctr_hmac_streaming_key-android",
         "//src/main/java/com/google/crypto/tink/streamingaead:aes_ctr_hmac_streaming_key_manager-android",
         "//src/main/java/com/google/crypto/tink/streamingaead:aes_ctr_hmac_streaming_parameters-android",
-        "//src/main/java/com/google/crypto/tink/streamingaead:aes_ctr_hmac_streaming_proto_serialization-android",
         "//src/main/java/com/google/crypto/tink/streamingaead:aes_gcm_hkdf_streaming_key-android",
         "//src/main/java/com/google/crypto/tink/streamingaead:aes_gcm_hkdf_streaming_key_manager-android",
         "//src/main/java/com/google/crypto/tink/streamingaead:aes_gcm_hkdf_streaming_parameters-android",
@@ -850,6 +849,7 @@ gen_maven_jar_rules(
         "//src/main/java/com/google/crypto/tink/streamingaead:streaming_aead_parameters-android",
         "//src/main/java/com/google/crypto/tink/streamingaead:streaming_aead_util-android",
         "//src/main/java/com/google/crypto/tink/streamingaead:streaming_aead_wrapper-android",
+        "//src/main/java/com/google/crypto/tink/streamingaead/internal:aes_ctr_hmac_streaming_proto_serialization-android",
         "//src/main/java/com/google/crypto/tink/streamingaead/internal:aes_gcm_hkdf_streaming_proto_serialization-android",
         "//src/main/java/com/google/crypto/tink/streamingaead/internal:legacy_full_streaming_aead-android",
         "//src/main/java/com/google/crypto/tink/subtle:aes_ctr_hmac_streaming-android",

java_src/src/main/java/com/google/crypto/tink/signature/BUILD.bazel

@@ -247,7 +247,6 @@ java_library(
     deps = [
         ":ed25519_parameters",
         ":ed25519_private_key",
-        ":ed25519_proto_serialization",
         ":ed25519_public_key",
         ":ed25519_public_key_manager",
         "//proto:ed25519_java_proto",
@@ -271,6 +270,7 @@ java_library(
         "//src/main/java/com/google/crypto/tink/internal:primitive_constructor",
         "//src/main/java/com/google/crypto/tink/internal:tink_bug_exception",
         "//src/main/java/com/google/crypto/tink/internal:util",
+        "//src/main/java/com/google/crypto/tink/signature/internal:ed25519_proto_serialization",
         "//src/main/java/com/google/crypto/tink/subtle:ed25519_sign",
         "//src/main/java/com/google/crypto/tink/subtle:ed25519_verify",
         "//src/main/java/com/google/crypto/tink/util:bytes",
@@ -453,33 +453,6 @@ java_library(
     ],
 )
 
-java_library(
-    name = "ed25519_proto_serialization",
-    srcs = ["Ed25519ProtoSerialization.java"],
-    deps = [
-        ":ed25519_parameters",
-        ":ed25519_private_key",
-        ":ed25519_public_key",
-        "//proto:ed25519_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:enum_type_proto_converter",
-        "//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",
-    ],
-)
-
 java_library(
     name = "rsa_ssa_pss_parameters",
     srcs = ["RsaSsaPssParameters.java"],
@@ -765,7 +738,6 @@ android_library(
     deps = [
         ":ed25519_parameters-android",
         ":ed25519_private_key-android",
-        ":ed25519_proto_serialization-android",
         ":ed25519_public_key-android",
         ":ed25519_public_key_manager-android",
         "//proto:ed25519_java_proto_lite",
@@ -789,6 +761,7 @@ android_library(
         "//src/main/java/com/google/crypto/tink/internal:primitive_constructor-android",
         "//src/main/java/com/google/crypto/tink/internal:tink_bug_exception-android",
         "//src/main/java/com/google/crypto/tink/internal:util-android",
+        "//src/main/java/com/google/crypto/tink/signature/internal:ed25519_proto_serialization-android",
         "//src/main/java/com/google/crypto/tink/subtle:ed25519_sign-android",
         "//src/main/java/com/google/crypto/tink/subtle:ed25519_verify-android",
         "//src/main/java/com/google/crypto/tink/util:bytes-android",
@@ -971,33 +944,6 @@ android_library(
     ],
 )
 
-android_library(
-    name = "ed25519_proto_serialization-android",
-    srcs = ["Ed25519ProtoSerialization.java"],
-    deps = [
-        ":ed25519_parameters-android",
-        ":ed25519_private_key-android",
-        ":ed25519_public_key-android",
-        "//proto:ed25519_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:enum_type_proto_converter-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",
-    ],
-)
-
 android_library(
     name = "rsa_ssa_pss_parameters-android",
     srcs = ["RsaSsaPssParameters.java"],

java_src/src/main/java/com/google/crypto/tink/signature/Ed25519PrivateKeyManager.java

@@ -37,6 +37,7 @@
 import com.google.crypto.tink.internal.PrimitiveConstructor;
 import com.google.crypto.tink.internal.Util;
 import com.google.crypto.tink.proto.KeyData.KeyMaterialType;
+import com.google.crypto.tink.signature.internal.Ed25519ProtoSerialization;
 import com.google.crypto.tink.subtle.Ed25519Sign;
 import com.google.crypto.tink.subtle.Ed25519Verify;
 import com.google.crypto.tink.util.Bytes;

java_src/src/main/java/com/google/crypto/tink/signature/internal/BUILD.bazel

@@ -263,3 +263,57 @@ android_library(
         "@maven//:com_google_protobuf_protobuf_javalite",
     ],
 )
+
+android_library(
+    name = "ed25519_proto_serialization-android",
+    srcs = ["Ed25519ProtoSerialization.java"],
+    deps = [
+        "//proto:ed25519_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:enum_type_proto_converter-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/signature:ed25519_parameters-android",
+        "//src/main/java/com/google/crypto/tink/signature:ed25519_private_key-android",
+        "//src/main/java/com/google/crypto/tink/signature:ed25519_public_key-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 = "ed25519_proto_serialization",
+    srcs = ["Ed25519ProtoSerialization.java"],
+    deps = [
+        "//proto:ed25519_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:enum_type_proto_converter",
+        "//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/signature:ed25519_parameters",
+        "//src/main/java/com/google/crypto/tink/signature:ed25519_private_key",
+        "//src/main/java/com/google/crypto/tink/signature:ed25519_public_key",
+        "//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",
+    ],
+)

java_src/src/main/java/com/google/crypto/tink/signature/Ed25519ProtoSerialization.java java_src/src/main/java/com/google/crypto/tink/signature/internal/Ed25519ProtoSerialization.java

@@ -14,7 +14,7 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-package com.google.crypto.tink.signature;
+package com.google.crypto.tink.signature.internal;
 
 import static com.google.crypto.tink.internal.Util.toBytesFromPrintableAscii;
 
@@ -32,6 +32,9 @@
 import com.google.crypto.tink.proto.KeyData.KeyMaterialType;
 import com.google.crypto.tink.proto.KeyTemplate;
 import com.google.crypto.tink.proto.OutputPrefixType;
+import com.google.crypto.tink.signature.Ed25519Parameters;
+import com.google.crypto.tink.signature.Ed25519PrivateKey;
+import com.google.crypto.tink.signature.Ed25519PublicKey;
 import com.google.crypto.tink.util.Bytes;
 import com.google.crypto.tink.util.SecretBytes;
 import com.google.protobuf.ByteString;
@@ -46,7 +49,7 @@
  */
 @AccessesPartialKey
 @SuppressWarnings("UnnecessarilyFullyQualified") // Fully specifying proto types is more readable
-final class Ed25519ProtoSerialization {
+public final class Ed25519ProtoSerialization {
   private static final String PRIVATE_TYPE_URL =
       "type.googleapis.com/google.crypto.tink.Ed25519PrivateKey";
   private static final Bytes PRIVATE_TYPE_URL_BYTES = toBytesFromPrintableAscii(PRIVATE_TYPE_URL);

java_src/src/main/java/com/google/crypto/tink/streamingaead/AesCtrHmacStreamingKeyManager.java

@@ -31,6 +31,7 @@
 import com.google.crypto.tink.internal.MutablePrimitiveRegistry;
 import com.google.crypto.tink.internal.PrimitiveConstructor;
 import com.google.crypto.tink.proto.KeyData.KeyMaterialType;
+import com.google.crypto.tink.streamingaead.internal.AesCtrHmacStreamingProtoSerialization;
 import com.google.crypto.tink.subtle.AesCtrHmacStreaming;
 import com.google.crypto.tink.util.SecretBytes;
 import java.security.GeneralSecurityException;