Skip to content
This repository was archived by the owner on Apr 17, 2024. It is now read-only.

Commit 64453ab

Browse files
LizaTretyakovacopybara-github
LizaTretyakova
authored and
copybara-github
committed
Move EciesProtoSerialization, AesCmacPrfSerialization, and HkdfPrfProtoSerialization into internal/ and make it public for the use in test for future ConfigurationV0.
PiperOrigin-RevId: 615002990
1 parent 07f5f10 commit 64453ab

19 files changed

+295
-276
lines changed

‎java_src/BUILD.bazel

+6-6
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ gen_maven_jar_rules(
144144
"//src/main/java/com/google/crypto/tink/hybrid:ecies_aead_hkdf_public_key_manager",
145145
"//src/main/java/com/google/crypto/tink/hybrid:ecies_parameters",
146146
"//src/main/java/com/google/crypto/tink/hybrid:ecies_private_key",
147-
"//src/main/java/com/google/crypto/tink/hybrid:ecies_proto_serialization",
148147
"//src/main/java/com/google/crypto/tink/hybrid:ecies_public_key",
149148
"//src/main/java/com/google/crypto/tink/hybrid:hpke_parameters",
150149
"//src/main/java/com/google/crypto/tink/hybrid:hpke_private_key",
@@ -165,6 +164,7 @@ gen_maven_jar_rules(
165164
"//src/main/java/com/google/crypto/tink/hybrid:predefined_hybrid_parameters",
166165
"//src/main/java/com/google/crypto/tink/hybrid/internal:aes_gcm_hpke_aead",
167166
"//src/main/java/com/google/crypto/tink/hybrid/internal:chacha20_poly1305_hpke_aead",
167+
"//src/main/java/com/google/crypto/tink/hybrid/internal:ecies_proto_serialization",
168168
"//src/main/java/com/google/crypto/tink/hybrid/internal:hkdf_hpke_kdf",
169169
"//src/main/java/com/google/crypto/tink/hybrid/internal:hpke_aead",
170170
"//src/main/java/com/google/crypto/tink/hybrid/internal:hpke_context",
@@ -317,11 +317,9 @@ gen_maven_jar_rules(
317317
"//src/main/java/com/google/crypto/tink/prf:aes_cmac_prf_key",
318318
"//src/main/java/com/google/crypto/tink/prf:aes_cmac_prf_key_manager",
319319
"//src/main/java/com/google/crypto/tink/prf:aes_cmac_prf_parameters",
320-
"//src/main/java/com/google/crypto/tink/prf:aes_cmac_prf_proto_serialization",
321320
"//src/main/java/com/google/crypto/tink/prf:hkdf_prf_key",
322321
"//src/main/java/com/google/crypto/tink/prf:hkdf_prf_key_manager",
323322
"//src/main/java/com/google/crypto/tink/prf:hkdf_prf_parameters",
324-
"//src/main/java/com/google/crypto/tink/prf:hkdf_prf_proto_serialization",
325323
"//src/main/java/com/google/crypto/tink/prf:hmac_prf_key",
326324
"//src/main/java/com/google/crypto/tink/prf:hmac_prf_key_manager",
327325
"//src/main/java/com/google/crypto/tink/prf:hmac_prf_parameters",
@@ -332,6 +330,8 @@ gen_maven_jar_rules(
332330
"//src/main/java/com/google/crypto/tink/prf:prf_parameters",
333331
"//src/main/java/com/google/crypto/tink/prf:prf_set",
334332
"//src/main/java/com/google/crypto/tink/prf:prf_set_wrapper",
333+
"//src/main/java/com/google/crypto/tink/prf/internal:aes_cmac_prf_proto_serialization",
334+
"//src/main/java/com/google/crypto/tink/prf/internal:hkdf_prf_proto_serialization",
335335
"//src/main/java/com/google/crypto/tink/prf/internal:hmac_prf_proto_serialization",
336336
"//src/main/java/com/google/crypto/tink/prf/internal:legacy_full_prf",
337337
"//src/main/java/com/google/crypto/tink/signature:ecdsa_parameters",
@@ -597,7 +597,6 @@ gen_maven_jar_rules(
597597
"//src/main/java/com/google/crypto/tink/hybrid:ecies_aead_hkdf_public_key_manager-android",
598598
"//src/main/java/com/google/crypto/tink/hybrid:ecies_parameters-android",
599599
"//src/main/java/com/google/crypto/tink/hybrid:ecies_private_key-android",
600-
"//src/main/java/com/google/crypto/tink/hybrid:ecies_proto_serialization-android",
601600
"//src/main/java/com/google/crypto/tink/hybrid:ecies_public_key-android",
602601
"//src/main/java/com/google/crypto/tink/hybrid:hpke_parameters-android",
603602
"//src/main/java/com/google/crypto/tink/hybrid:hpke_private_key-android",
@@ -618,6 +617,7 @@ gen_maven_jar_rules(
618617
"//src/main/java/com/google/crypto/tink/hybrid:predefined_hybrid_parameters-android",
619618
"//src/main/java/com/google/crypto/tink/hybrid/internal:aes_gcm_hpke_aead-android",
620619
"//src/main/java/com/google/crypto/tink/hybrid/internal:chacha20_poly1305_hpke_aead-android",
620+
"//src/main/java/com/google/crypto/tink/hybrid/internal:ecies_proto_serialization-android",
621621
"//src/main/java/com/google/crypto/tink/hybrid/internal:hkdf_hpke_kdf-android",
622622
"//src/main/java/com/google/crypto/tink/hybrid/internal:hpke_aead-android",
623623
"//src/main/java/com/google/crypto/tink/hybrid/internal:hpke_context-android",
@@ -774,11 +774,9 @@ gen_maven_jar_rules(
774774
"//src/main/java/com/google/crypto/tink/prf:aes_cmac_prf_key-android",
775775
"//src/main/java/com/google/crypto/tink/prf:aes_cmac_prf_key_manager-android",
776776
"//src/main/java/com/google/crypto/tink/prf:aes_cmac_prf_parameters-android",
777-
"//src/main/java/com/google/crypto/tink/prf:aes_cmac_prf_proto_serialization-android",
778777
"//src/main/java/com/google/crypto/tink/prf:hkdf_prf_key-android",
779778
"//src/main/java/com/google/crypto/tink/prf:hkdf_prf_key_manager-android",
780779
"//src/main/java/com/google/crypto/tink/prf:hkdf_prf_parameters-android",
781-
"//src/main/java/com/google/crypto/tink/prf:hkdf_prf_proto_serialization-android",
782780
"//src/main/java/com/google/crypto/tink/prf:hmac_prf_key-android",
783781
"//src/main/java/com/google/crypto/tink/prf:hmac_prf_key_manager-android",
784782
"//src/main/java/com/google/crypto/tink/prf:hmac_prf_parameters-android",
@@ -789,6 +787,8 @@ gen_maven_jar_rules(
789787
"//src/main/java/com/google/crypto/tink/prf:prf_parameters-android",
790788
"//src/main/java/com/google/crypto/tink/prf:prf_set-android",
791789
"//src/main/java/com/google/crypto/tink/prf:prf_set_wrapper-android",
790+
"//src/main/java/com/google/crypto/tink/prf/internal:aes_cmac_prf_proto_serialization-android",
791+
"//src/main/java/com/google/crypto/tink/prf/internal:hkdf_prf_proto_serialization-android",
792792
"//src/main/java/com/google/crypto/tink/prf/internal:hmac_prf_proto_serialization-android",
793793
"//src/main/java/com/google/crypto/tink/prf/internal:legacy_full_prf-android",
794794
"//src/main/java/com/google/crypto/tink/signature:ecdsa_parameters-android",

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

+2-64
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ java_library(
9292
":ecies_aead_hkdf_public_key_manager",
9393
":ecies_parameters",
9494
":ecies_private_key",
95-
":ecies_proto_serialization",
9695
":ecies_public_key",
9796
"//proto:ecies_aead_hkdf_java_proto",
9897
"//proto:tink_java_proto",
@@ -107,6 +106,7 @@ java_library(
107106
"//src/main/java/com/google/crypto/tink/aead:aes_ctr_hmac_aead_parameters",
108107
"//src/main/java/com/google/crypto/tink/aead:aes_gcm_parameters",
109108
"//src/main/java/com/google/crypto/tink/config/internal:tink_fips_util",
109+
"//src/main/java/com/google/crypto/tink/hybrid/internal:ecies_proto_serialization",
110110
"//src/main/java/com/google/crypto/tink/internal:elliptic_curves_util",
111111
"//src/main/java/com/google/crypto/tink/internal:key_manager_registry",
112112
"//src/main/java/com/google/crypto/tink/internal:legacy_key_manager_impl",
@@ -298,37 +298,6 @@ java_library(
298298
],
299299
)
300300

301-
java_library(
302-
name = "ecies_proto_serialization",
303-
srcs = ["EciesProtoSerialization.java"],
304-
deps = [
305-
":ecies_parameters",
306-
":ecies_private_key",
307-
":ecies_public_key",
308-
"//proto:common_java_proto",
309-
"//proto:ecies_aead_hkdf_java_proto",
310-
"//proto:tink_java_proto",
311-
"//src/main/java/com/google/crypto/tink:accesses_partial_key",
312-
"//src/main/java/com/google/crypto/tink:secret_key_access",
313-
"//src/main/java/com/google/crypto/tink:tink_proto_parameters_format",
314-
"//src/main/java/com/google/crypto/tink/internal:big_integer_encoding",
315-
"//src/main/java/com/google/crypto/tink/internal:enum_type_proto_converter",
316-
"//src/main/java/com/google/crypto/tink/internal:key_parser",
317-
"//src/main/java/com/google/crypto/tink/internal:key_serializer",
318-
"//src/main/java/com/google/crypto/tink/internal:mutable_serialization_registry",
319-
"//src/main/java/com/google/crypto/tink/internal:parameters_parser",
320-
"//src/main/java/com/google/crypto/tink/internal:parameters_serializer",
321-
"//src/main/java/com/google/crypto/tink/internal:proto_key_serialization",
322-
"//src/main/java/com/google/crypto/tink/internal:proto_parameters_serialization",
323-
"//src/main/java/com/google/crypto/tink/internal:util",
324-
"//src/main/java/com/google/crypto/tink/util:bytes",
325-
"//src/main/java/com/google/crypto/tink/util:secret_big_integer",
326-
"//src/main/java/com/google/crypto/tink/util:secret_bytes",
327-
"@maven//:com_google_code_findbugs_jsr305",
328-
"@maven//:com_google_protobuf_protobuf_java",
329-
],
330-
)
331-
332301
java_library(
333302
name = "ecies_private_key",
334303
srcs = ["EciesPrivateKey.java"],
@@ -439,7 +408,6 @@ android_library(
439408
":ecies_aead_hkdf_public_key_manager-android",
440409
":ecies_parameters-android",
441410
":ecies_private_key-android",
442-
":ecies_proto_serialization-android",
443411
":ecies_public_key-android",
444412
"//proto:ecies_aead_hkdf_java_proto_lite",
445413
"//proto:tink_java_proto_lite",
@@ -454,6 +422,7 @@ android_library(
454422
"//src/main/java/com/google/crypto/tink/aead:aes_ctr_hmac_aead_parameters-android",
455423
"//src/main/java/com/google/crypto/tink/aead:aes_gcm_parameters-android",
456424
"//src/main/java/com/google/crypto/tink/config/internal:tink_fips_util-android",
425+
"//src/main/java/com/google/crypto/tink/hybrid/internal:ecies_proto_serialization-android",
457426
"//src/main/java/com/google/crypto/tink/internal:elliptic_curves_util-android",
458427
"//src/main/java/com/google/crypto/tink/internal:key_manager_registry-android",
459428
"//src/main/java/com/google/crypto/tink/internal:legacy_key_manager_impl-android",
@@ -629,37 +598,6 @@ android_library(
629598
],
630599
)
631600

632-
android_library(
633-
name = "ecies_proto_serialization-android",
634-
srcs = ["EciesProtoSerialization.java"],
635-
deps = [
636-
":ecies_parameters-android",
637-
":ecies_private_key-android",
638-
":ecies_public_key-android",
639-
"//proto:common_java_proto_lite",
640-
"//proto:ecies_aead_hkdf_java_proto_lite",
641-
"//proto:tink_java_proto_lite",
642-
"//src/main/java/com/google/crypto/tink:accesses_partial_key-android",
643-
"//src/main/java/com/google/crypto/tink:secret_key_access-android",
644-
"//src/main/java/com/google/crypto/tink:tink_proto_parameters_format-android",
645-
"//src/main/java/com/google/crypto/tink/internal:big_integer_encoding-android",
646-
"//src/main/java/com/google/crypto/tink/internal:enum_type_proto_converter-android",
647-
"//src/main/java/com/google/crypto/tink/internal:key_parser-android",
648-
"//src/main/java/com/google/crypto/tink/internal:key_serializer-android",
649-
"//src/main/java/com/google/crypto/tink/internal:mutable_serialization_registry-android",
650-
"//src/main/java/com/google/crypto/tink/internal:parameters_parser-android",
651-
"//src/main/java/com/google/crypto/tink/internal:parameters_serializer-android",
652-
"//src/main/java/com/google/crypto/tink/internal:proto_key_serialization-android",
653-
"//src/main/java/com/google/crypto/tink/internal:proto_parameters_serialization-android",
654-
"//src/main/java/com/google/crypto/tink/internal:util-android",
655-
"//src/main/java/com/google/crypto/tink/util:bytes-android",
656-
"//src/main/java/com/google/crypto/tink/util:secret_big_integer-android",
657-
"//src/main/java/com/google/crypto/tink/util:secret_bytes-android",
658-
"@maven//:com_google_code_findbugs_jsr305",
659-
"@maven//:com_google_protobuf_protobuf_javalite",
660-
],
661-
)
662-
663601
android_library(
664602
name = "ecies_public_key-android",
665603
srcs = ["EciesPublicKey.java"],

‎java_src/src/main/java/com/google/crypto/tink/hybrid/EciesAeadHkdfPrivateKeyManager.java

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import com.google.crypto.tink.aead.AesCtrHmacAeadParameters;
3030
import com.google.crypto.tink.aead.AesGcmParameters;
3131
import com.google.crypto.tink.config.internal.TinkFipsUtil;
32+
import com.google.crypto.tink.hybrid.internal.EciesProtoSerialization;
3233
import com.google.crypto.tink.internal.EllipticCurvesUtil;
3334
import com.google.crypto.tink.internal.KeyManagerRegistry;
3435
import com.google.crypto.tink.internal.LegacyKeyManagerImpl;

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

+62
Original file line numberDiff line numberDiff line change
@@ -617,3 +617,65 @@ java_library(
617617
"@maven//:com_google_errorprone_error_prone_annotations",
618618
],
619619
)
620+
621+
android_library(
622+
name = "ecies_proto_serialization-android",
623+
srcs = ["EciesProtoSerialization.java"],
624+
deps = [
625+
"//proto:common_java_proto_lite",
626+
"//proto:ecies_aead_hkdf_java_proto_lite",
627+
"//proto:tink_java_proto_lite",
628+
"//src/main/java/com/google/crypto/tink:accesses_partial_key-android",
629+
"//src/main/java/com/google/crypto/tink:secret_key_access-android",
630+
"//src/main/java/com/google/crypto/tink:tink_proto_parameters_format-android",
631+
"//src/main/java/com/google/crypto/tink/hybrid:ecies_parameters-android",
632+
"//src/main/java/com/google/crypto/tink/hybrid:ecies_private_key-android",
633+
"//src/main/java/com/google/crypto/tink/hybrid:ecies_public_key-android",
634+
"//src/main/java/com/google/crypto/tink/internal:big_integer_encoding-android",
635+
"//src/main/java/com/google/crypto/tink/internal:enum_type_proto_converter-android",
636+
"//src/main/java/com/google/crypto/tink/internal:key_parser-android",
637+
"//src/main/java/com/google/crypto/tink/internal:key_serializer-android",
638+
"//src/main/java/com/google/crypto/tink/internal:mutable_serialization_registry-android",
639+
"//src/main/java/com/google/crypto/tink/internal:parameters_parser-android",
640+
"//src/main/java/com/google/crypto/tink/internal:parameters_serializer-android",
641+
"//src/main/java/com/google/crypto/tink/internal:proto_key_serialization-android",
642+
"//src/main/java/com/google/crypto/tink/internal:proto_parameters_serialization-android",
643+
"//src/main/java/com/google/crypto/tink/internal:util-android",
644+
"//src/main/java/com/google/crypto/tink/util:bytes-android",
645+
"//src/main/java/com/google/crypto/tink/util:secret_big_integer-android",
646+
"//src/main/java/com/google/crypto/tink/util:secret_bytes-android",
647+
"@maven//:com_google_code_findbugs_jsr305",
648+
"@maven//:com_google_protobuf_protobuf_javalite",
649+
],
650+
)
651+
652+
java_library(
653+
name = "ecies_proto_serialization",
654+
srcs = ["EciesProtoSerialization.java"],
655+
deps = [
656+
"//proto:common_java_proto",
657+
"//proto:ecies_aead_hkdf_java_proto",
658+
"//proto:tink_java_proto",
659+
"//src/main/java/com/google/crypto/tink:accesses_partial_key",
660+
"//src/main/java/com/google/crypto/tink:secret_key_access",
661+
"//src/main/java/com/google/crypto/tink:tink_proto_parameters_format",
662+
"//src/main/java/com/google/crypto/tink/hybrid:ecies_parameters",
663+
"//src/main/java/com/google/crypto/tink/hybrid:ecies_private_key",
664+
"//src/main/java/com/google/crypto/tink/hybrid:ecies_public_key",
665+
"//src/main/java/com/google/crypto/tink/internal:big_integer_encoding",
666+
"//src/main/java/com/google/crypto/tink/internal:enum_type_proto_converter",
667+
"//src/main/java/com/google/crypto/tink/internal:key_parser",
668+
"//src/main/java/com/google/crypto/tink/internal:key_serializer",
669+
"//src/main/java/com/google/crypto/tink/internal:mutable_serialization_registry",
670+
"//src/main/java/com/google/crypto/tink/internal:parameters_parser",
671+
"//src/main/java/com/google/crypto/tink/internal:parameters_serializer",
672+
"//src/main/java/com/google/crypto/tink/internal:proto_key_serialization",
673+
"//src/main/java/com/google/crypto/tink/internal:proto_parameters_serialization",
674+
"//src/main/java/com/google/crypto/tink/internal:util",
675+
"//src/main/java/com/google/crypto/tink/util:bytes",
676+
"//src/main/java/com/google/crypto/tink/util:secret_big_integer",
677+
"//src/main/java/com/google/crypto/tink/util:secret_bytes",
678+
"@maven//:com_google_code_findbugs_jsr305",
679+
"@maven//:com_google_protobuf_protobuf_java",
680+
],
681+
)

‎java_src/src/main/java/com/google/crypto/tink/hybrid/EciesProtoSerialization.java ‎java_src/src/main/java/com/google/crypto/tink/hybrid/internal/EciesProtoSerialization.java

+5-2
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,16 @@
1414
//
1515
////////////////////////////////////////////////////////////////////////////////
1616

17-
package com.google.crypto.tink.hybrid;
17+
package com.google.crypto.tink.hybrid.internal;
1818

1919
import static com.google.crypto.tink.internal.Util.toBytesFromPrintableAscii;
2020

2121
import com.google.crypto.tink.AccessesPartialKey;
2222
import com.google.crypto.tink.SecretKeyAccess;
2323
import com.google.crypto.tink.TinkProtoParametersFormat;
24+
import com.google.crypto.tink.hybrid.EciesParameters;
25+
import com.google.crypto.tink.hybrid.EciesPrivateKey;
26+
import com.google.crypto.tink.hybrid.EciesPublicKey;
2427
import com.google.crypto.tink.internal.BigIntegerEncoding;
2528
import com.google.crypto.tink.internal.EnumTypeProtoConverter;
2629
import com.google.crypto.tink.internal.KeyParser;
@@ -51,7 +54,7 @@
5154
/** Methods to serialize and parse {@link EciesParameters} objects. */
5255
@AccessesPartialKey
5356
@SuppressWarnings("UnnecessarilyFullyQualified") // Fully specifying proto types is more readable
54-
final class EciesProtoSerialization {
57+
public final class EciesProtoSerialization {
5558
private static final String PRIVATE_TYPE_URL =
5659
"type.googleapis.com/google.crypto.tink.EciesAeadHkdfPrivateKey";
5760
private static final Bytes PRIVATE_TYPE_URL_BYTES = toBytesFromPrintableAscii(PRIVATE_TYPE_URL);

‎java_src/src/main/java/com/google/crypto/tink/prf/AesCmacPrfKeyManager.java

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import com.google.crypto.tink.internal.MutableParametersRegistry;
3030
import com.google.crypto.tink.internal.MutablePrimitiveRegistry;
3131
import com.google.crypto.tink.internal.PrimitiveConstructor;
32+
import com.google.crypto.tink.prf.internal.AesCmacPrfProtoSerialization;
3233
import com.google.crypto.tink.proto.KeyData.KeyMaterialType;
3334
import com.google.crypto.tink.subtle.PrfAesCmac;
3435
import com.google.crypto.tink.util.SecretBytes;

0 commit comments

Comments
 (0)