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

Commit 07f5f10

Browse files
LizaTretyakovacopybara-github
LizaTretyakova
authored and
copybara-github
committed
Move AesCmacProtoSerialization, AesAexProtoSerialization, and AesGcmSivProtoSerialization into internal/ and make it public for the use in test for future ConfigurationV0.
PiperOrigin-RevId: 614986566
1 parent ceb21e3 commit 07f5f10

23 files changed

+271
-251
lines changed

‎java_src/BUILD.bazel

+6-6
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,12 @@ gen_maven_jar_rules(
7979
"//src/main/java/com/google/crypto/tink/aead:aes_eax_key",
8080
"//src/main/java/com/google/crypto/tink/aead:aes_eax_key_manager",
8181
"//src/main/java/com/google/crypto/tink/aead:aes_eax_parameters",
82-
"//src/main/java/com/google/crypto/tink/aead:aes_eax_proto_serialization",
8382
"//src/main/java/com/google/crypto/tink/aead:aes_gcm_key",
8483
"//src/main/java/com/google/crypto/tink/aead:aes_gcm_key_manager",
8584
"//src/main/java/com/google/crypto/tink/aead:aes_gcm_parameters",
8685
"//src/main/java/com/google/crypto/tink/aead:aes_gcm_siv_key",
8786
"//src/main/java/com/google/crypto/tink/aead:aes_gcm_siv_key_manager",
8887
"//src/main/java/com/google/crypto/tink/aead:aes_gcm_siv_parameters",
89-
"//src/main/java/com/google/crypto/tink/aead:aes_gcm_siv_proto_serialization",
9088
"//src/main/java/com/google/crypto/tink/aead:cha_cha20_poly1305_key",
9189
"//src/main/java/com/google/crypto/tink/aead:cha_cha20_poly1305_key_manager",
9290
"//src/main/java/com/google/crypto/tink/aead:cha_cha20_poly1305_parameters",
@@ -105,7 +103,9 @@ gen_maven_jar_rules(
105103
"//src/main/java/com/google/crypto/tink/aead:x_cha_cha20_poly1305_key_manager",
106104
"//src/main/java/com/google/crypto/tink/aead:x_cha_cha20_poly1305_parameters",
107105
"//src/main/java/com/google/crypto/tink/aead/internal:aes_ctr_hmac_aead_proto_serialization",
106+
"//src/main/java/com/google/crypto/tink/aead/internal:aes_eax_proto_serialization",
108107
"//src/main/java/com/google/crypto/tink/aead/internal:aes_gcm_proto_serialization",
108+
"//src/main/java/com/google/crypto/tink/aead/internal:aes_gcm_siv_proto_serialization",
109109
"//src/main/java/com/google/crypto/tink/aead/internal:cha_cha20_poly1305_jce",
110110
"//src/main/java/com/google/crypto/tink/aead/internal:cha_cha20_util",
111111
"//src/main/java/com/google/crypto/tink/aead/internal:insecure_nonce_aes_gcm_jce",
@@ -287,7 +287,6 @@ gen_maven_jar_rules(
287287
"//src/main/java/com/google/crypto/tink/mac:aes_cmac_key",
288288
"//src/main/java/com/google/crypto/tink/mac:aes_cmac_key_manager",
289289
"//src/main/java/com/google/crypto/tink/mac:aes_cmac_parameters",
290-
"//src/main/java/com/google/crypto/tink/mac:aes_cmac_proto_serialization",
291290
"//src/main/java/com/google/crypto/tink/mac:chunked_mac",
292291
"//src/main/java/com/google/crypto/tink/mac:chunked_mac_computation",
293292
"//src/main/java/com/google/crypto/tink/mac:chunked_mac_verification",
@@ -302,6 +301,7 @@ gen_maven_jar_rules(
302301
"//src/main/java/com/google/crypto/tink/mac:mac_parameters",
303302
"//src/main/java/com/google/crypto/tink/mac:mac_wrapper",
304303
"//src/main/java/com/google/crypto/tink/mac:predefined_mac_parameters",
304+
"//src/main/java/com/google/crypto/tink/mac/internal:aes_cmac_proto_serialization",
305305
"//src/main/java/com/google/crypto/tink/mac/internal:aes_util",
306306
"//src/main/java/com/google/crypto/tink/mac/internal:chunked_aes_cmac_computation",
307307
"//src/main/java/com/google/crypto/tink/mac/internal:chunked_aes_cmac_impl",
@@ -532,14 +532,12 @@ gen_maven_jar_rules(
532532
"//src/main/java/com/google/crypto/tink/aead:aes_eax_key-android",
533533
"//src/main/java/com/google/crypto/tink/aead:aes_eax_key_manager-android",
534534
"//src/main/java/com/google/crypto/tink/aead:aes_eax_parameters-android",
535-
"//src/main/java/com/google/crypto/tink/aead:aes_eax_proto_serialization-android",
536535
"//src/main/java/com/google/crypto/tink/aead:aes_gcm_key-android",
537536
"//src/main/java/com/google/crypto/tink/aead:aes_gcm_key_manager-android",
538537
"//src/main/java/com/google/crypto/tink/aead:aes_gcm_parameters-android",
539538
"//src/main/java/com/google/crypto/tink/aead:aes_gcm_siv_key-android",
540539
"//src/main/java/com/google/crypto/tink/aead:aes_gcm_siv_key_manager-android",
541540
"//src/main/java/com/google/crypto/tink/aead:aes_gcm_siv_parameters-android",
542-
"//src/main/java/com/google/crypto/tink/aead:aes_gcm_siv_proto_serialization-android",
543541
"//src/main/java/com/google/crypto/tink/aead:cha_cha20_poly1305_key-android",
544542
"//src/main/java/com/google/crypto/tink/aead:cha_cha20_poly1305_key_manager-android",
545543
"//src/main/java/com/google/crypto/tink/aead:cha_cha20_poly1305_parameters-android",
@@ -558,7 +556,9 @@ gen_maven_jar_rules(
558556
"//src/main/java/com/google/crypto/tink/aead:x_cha_cha20_poly1305_key_manager-android",
559557
"//src/main/java/com/google/crypto/tink/aead:x_cha_cha20_poly1305_parameters-android",
560558
"//src/main/java/com/google/crypto/tink/aead/internal:aes_ctr_hmac_aead_proto_serialization-android",
559+
"//src/main/java/com/google/crypto/tink/aead/internal:aes_eax_proto_serialization-android",
561560
"//src/main/java/com/google/crypto/tink/aead/internal:aes_gcm_proto_serialization-android",
561+
"//src/main/java/com/google/crypto/tink/aead/internal:aes_gcm_siv_proto_serialization-android",
562562
"//src/main/java/com/google/crypto/tink/aead/internal:cha_cha20_poly1305_jce-android",
563563
"//src/main/java/com/google/crypto/tink/aead/internal:cha_cha20_util-android",
564564
"//src/main/java/com/google/crypto/tink/aead/internal:insecure_nonce_aes_gcm_jce-android",
@@ -744,7 +744,6 @@ gen_maven_jar_rules(
744744
"//src/main/java/com/google/crypto/tink/mac:aes_cmac_key-android",
745745
"//src/main/java/com/google/crypto/tink/mac:aes_cmac_key_manager-android",
746746
"//src/main/java/com/google/crypto/tink/mac:aes_cmac_parameters-android",
747-
"//src/main/java/com/google/crypto/tink/mac:aes_cmac_proto_serialization-android",
748747
"//src/main/java/com/google/crypto/tink/mac:chunked_mac-android",
749748
"//src/main/java/com/google/crypto/tink/mac:chunked_mac_computation-android",
750749
"//src/main/java/com/google/crypto/tink/mac:chunked_mac_verification-android",
@@ -759,6 +758,7 @@ gen_maven_jar_rules(
759758
"//src/main/java/com/google/crypto/tink/mac:mac_parameters-android",
760759
"//src/main/java/com/google/crypto/tink/mac:mac_wrapper-android",
761760
"//src/main/java/com/google/crypto/tink/mac:predefined_mac_parameters-android",
761+
"//src/main/java/com/google/crypto/tink/mac/internal:aes_cmac_proto_serialization-android",
762762
"//src/main/java/com/google/crypto/tink/mac/internal:aes_util-android",
763763
"//src/main/java/com/google/crypto/tink/mac/internal:chunked_aes_cmac_computation-android",
764764
"//src/main/java/com/google/crypto/tink/mac/internal:chunked_aes_cmac_impl-android",

‎java_src/src/main/java/com/google/crypto/tink/aead/AesEaxKeyManager.java

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import com.google.crypto.tink.KeyManager;
2424
import com.google.crypto.tink.KeyTemplate;
2525
import com.google.crypto.tink.Parameters;
26+
import com.google.crypto.tink.aead.internal.AesEaxProtoSerialization;
2627
import com.google.crypto.tink.config.internal.TinkFipsUtil;
2728
import com.google.crypto.tink.internal.KeyManagerRegistry;
2829
import com.google.crypto.tink.internal.LegacyKeyManagerImpl;

‎java_src/src/main/java/com/google/crypto/tink/aead/AesGcmSivKeyManager.java

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.google.crypto.tink.KeyTemplate;
2525
import com.google.crypto.tink.Parameters;
2626
import com.google.crypto.tink.SecretKeyAccess;
27+
import com.google.crypto.tink.aead.internal.AesGcmSivProtoSerialization;
2728
import com.google.crypto.tink.aead.subtle.AesGcmSiv;
2829
import com.google.crypto.tink.config.internal.TinkFipsUtil;
2930
import com.google.crypto.tink.internal.KeyManagerRegistry;

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

+4-104
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ java_library(
4242
deps = [
4343
":aes_gcm_siv_key",
4444
":aes_gcm_siv_parameters",
45-
":aes_gcm_siv_proto_serialization",
4645
"//proto:aes_gcm_siv_java_proto",
4746
"//proto:tink_java_proto",
4847
"//src/main/java/com/google/crypto/tink:accesses_partial_key",
@@ -51,6 +50,7 @@ java_library(
5150
"//src/main/java/com/google/crypto/tink:key_template",
5251
"//src/main/java/com/google/crypto/tink:parameters",
5352
"//src/main/java/com/google/crypto/tink:secret_key_access",
53+
"//src/main/java/com/google/crypto/tink/aead/internal:aes_gcm_siv_proto_serialization",
5454
"//src/main/java/com/google/crypto/tink/aead/subtle:aes_gcm_siv",
5555
"//src/main/java/com/google/crypto/tink/config/internal:tink_fips_util",
5656
"//src/main/java/com/google/crypto/tink/internal:key_manager_registry",
@@ -295,7 +295,6 @@ java_library(
295295
deps = [
296296
":aes_eax_key",
297297
":aes_eax_parameters",
298-
":aes_eax_proto_serialization",
299298
":predefined_aead_parameters",
300299
"//proto:aes_eax_java_proto",
301300
"//proto:tink_java_proto",
@@ -304,6 +303,7 @@ java_library(
304303
"//src/main/java/com/google/crypto/tink:key_manager",
305304
"//src/main/java/com/google/crypto/tink:key_template",
306305
"//src/main/java/com/google/crypto/tink:parameters",
306+
"//src/main/java/com/google/crypto/tink/aead/internal:aes_eax_proto_serialization",
307307
"//src/main/java/com/google/crypto/tink/config/internal:tink_fips_util",
308308
"//src/main/java/com/google/crypto/tink/internal:key_manager_registry",
309309
"//src/main/java/com/google/crypto/tink/internal:legacy_key_manager_impl",
@@ -381,31 +381,6 @@ java_library(
381381
],
382382
)
383383

384-
java_library(
385-
name = "aes_eax_proto_serialization",
386-
srcs = ["AesEaxProtoSerialization.java"],
387-
deps = [
388-
":aes_eax_key",
389-
":aes_eax_parameters",
390-
"//proto:aes_eax_java_proto",
391-
"//proto:tink_java_proto",
392-
"//src/main/java/com/google/crypto/tink:accesses_partial_key",
393-
"//src/main/java/com/google/crypto/tink:secret_key_access",
394-
"//src/main/java/com/google/crypto/tink/internal:key_parser",
395-
"//src/main/java/com/google/crypto/tink/internal:key_serializer",
396-
"//src/main/java/com/google/crypto/tink/internal:mutable_serialization_registry",
397-
"//src/main/java/com/google/crypto/tink/internal:parameters_parser",
398-
"//src/main/java/com/google/crypto/tink/internal:parameters_serializer",
399-
"//src/main/java/com/google/crypto/tink/internal:proto_key_serialization",
400-
"//src/main/java/com/google/crypto/tink/internal:proto_parameters_serialization",
401-
"//src/main/java/com/google/crypto/tink/internal:util",
402-
"//src/main/java/com/google/crypto/tink/util:bytes",
403-
"//src/main/java/com/google/crypto/tink/util:secret_bytes",
404-
"@maven//:com_google_code_findbugs_jsr305",
405-
"@maven//:com_google_protobuf_protobuf_java",
406-
],
407-
)
408-
409384
java_library(
410385
name = "aes_gcm_parameters",
411386
srcs = ["AesGcmParameters.java"],
@@ -456,31 +431,6 @@ java_library(
456431
],
457432
)
458433

459-
java_library(
460-
name = "aes_gcm_siv_proto_serialization",
461-
srcs = ["AesGcmSivProtoSerialization.java"],
462-
deps = [
463-
":aes_gcm_siv_key",
464-
":aes_gcm_siv_parameters",
465-
"//proto:aes_gcm_siv_java_proto",
466-
"//proto:tink_java_proto",
467-
"//src/main/java/com/google/crypto/tink:accesses_partial_key",
468-
"//src/main/java/com/google/crypto/tink:secret_key_access",
469-
"//src/main/java/com/google/crypto/tink/internal:key_parser",
470-
"//src/main/java/com/google/crypto/tink/internal:key_serializer",
471-
"//src/main/java/com/google/crypto/tink/internal:mutable_serialization_registry",
472-
"//src/main/java/com/google/crypto/tink/internal:parameters_parser",
473-
"//src/main/java/com/google/crypto/tink/internal:parameters_serializer",
474-
"//src/main/java/com/google/crypto/tink/internal:proto_key_serialization",
475-
"//src/main/java/com/google/crypto/tink/internal:proto_parameters_serialization",
476-
"//src/main/java/com/google/crypto/tink/internal:util",
477-
"//src/main/java/com/google/crypto/tink/util:bytes",
478-
"//src/main/java/com/google/crypto/tink/util:secret_bytes",
479-
"@maven//:com_google_code_findbugs_jsr305",
480-
"@maven//:com_google_protobuf_protobuf_java",
481-
],
482-
)
483-
484434
# Android libraries
485435

486436
android_library(
@@ -521,7 +471,6 @@ android_library(
521471
deps = [
522472
":aes_gcm_siv_key-android",
523473
":aes_gcm_siv_parameters-android",
524-
":aes_gcm_siv_proto_serialization-android",
525474
"//proto:aes_gcm_siv_java_proto_lite",
526475
"//proto:tink_java_proto_lite",
527476
"//src/main/java/com/google/crypto/tink:accesses_partial_key-android",
@@ -530,6 +479,7 @@ android_library(
530479
"//src/main/java/com/google/crypto/tink:key_template-android",
531480
"//src/main/java/com/google/crypto/tink:parameters-android",
532481
"//src/main/java/com/google/crypto/tink:secret_key_access-android",
482+
"//src/main/java/com/google/crypto/tink/aead/internal:aes_gcm_siv_proto_serialization-android",
533483
"//src/main/java/com/google/crypto/tink/aead/subtle:aes_gcm_siv-android",
534484
"//src/main/java/com/google/crypto/tink/config/internal:tink_fips_util-android",
535485
"//src/main/java/com/google/crypto/tink/internal:key_manager_registry-android",
@@ -774,7 +724,6 @@ android_library(
774724
deps = [
775725
":aes_eax_key-android",
776726
":aes_eax_parameters-android",
777-
":aes_eax_proto_serialization-android",
778727
":predefined_aead_parameters-android",
779728
"//proto:aes_eax_java_proto_lite",
780729
"//proto:tink_java_proto_lite",
@@ -783,6 +732,7 @@ android_library(
783732
"//src/main/java/com/google/crypto/tink:key_manager-android",
784733
"//src/main/java/com/google/crypto/tink:key_template-android",
785734
"//src/main/java/com/google/crypto/tink:parameters-android",
735+
"//src/main/java/com/google/crypto/tink/aead/internal:aes_eax_proto_serialization-android",
786736
"//src/main/java/com/google/crypto/tink/config/internal:tink_fips_util-android",
787737
"//src/main/java/com/google/crypto/tink/internal:key_manager_registry-android",
788738
"//src/main/java/com/google/crypto/tink/internal:legacy_key_manager_impl-android",
@@ -860,31 +810,6 @@ android_library(
860810
],
861811
)
862812

863-
android_library(
864-
name = "aes_eax_proto_serialization-android",
865-
srcs = ["AesEaxProtoSerialization.java"],
866-
deps = [
867-
":aes_eax_key-android",
868-
":aes_eax_parameters-android",
869-
"//proto:aes_eax_java_proto_lite",
870-
"//proto:tink_java_proto_lite",
871-
"//src/main/java/com/google/crypto/tink:accesses_partial_key-android",
872-
"//src/main/java/com/google/crypto/tink:secret_key_access-android",
873-
"//src/main/java/com/google/crypto/tink/internal:key_parser-android",
874-
"//src/main/java/com/google/crypto/tink/internal:key_serializer-android",
875-
"//src/main/java/com/google/crypto/tink/internal:mutable_serialization_registry-android",
876-
"//src/main/java/com/google/crypto/tink/internal:parameters_parser-android",
877-
"//src/main/java/com/google/crypto/tink/internal:parameters_serializer-android",
878-
"//src/main/java/com/google/crypto/tink/internal:proto_key_serialization-android",
879-
"//src/main/java/com/google/crypto/tink/internal:proto_parameters_serialization-android",
880-
"//src/main/java/com/google/crypto/tink/internal:util-android",
881-
"//src/main/java/com/google/crypto/tink/util:bytes-android",
882-
"//src/main/java/com/google/crypto/tink/util:secret_bytes-android",
883-
"@maven//:com_google_code_findbugs_jsr305",
884-
"@maven//:com_google_protobuf_protobuf_javalite",
885-
],
886-
)
887-
888813
android_library(
889814
name = "aes_gcm_parameters-android",
890815
srcs = ["AesGcmParameters.java"],
@@ -935,31 +860,6 @@ android_library(
935860
],
936861
)
937862

938-
android_library(
939-
name = "aes_gcm_siv_proto_serialization-android",
940-
srcs = ["AesGcmSivProtoSerialization.java"],
941-
deps = [
942-
":aes_gcm_siv_key-android",
943-
":aes_gcm_siv_parameters-android",
944-
"//proto:aes_gcm_siv_java_proto_lite",
945-
"//proto:tink_java_proto_lite",
946-
"//src/main/java/com/google/crypto/tink:accesses_partial_key-android",
947-
"//src/main/java/com/google/crypto/tink:secret_key_access-android",
948-
"//src/main/java/com/google/crypto/tink/internal:key_parser-android",
949-
"//src/main/java/com/google/crypto/tink/internal:key_serializer-android",
950-
"//src/main/java/com/google/crypto/tink/internal:mutable_serialization_registry-android",
951-
"//src/main/java/com/google/crypto/tink/internal:parameters_parser-android",
952-
"//src/main/java/com/google/crypto/tink/internal:parameters_serializer-android",
953-
"//src/main/java/com/google/crypto/tink/internal:proto_key_serialization-android",
954-
"//src/main/java/com/google/crypto/tink/internal:proto_parameters_serialization-android",
955-
"//src/main/java/com/google/crypto/tink/internal:util-android",
956-
"//src/main/java/com/google/crypto/tink/util:bytes-android",
957-
"//src/main/java/com/google/crypto/tink/util:secret_bytes-android",
958-
"@maven//:com_google_code_findbugs_jsr305",
959-
"@maven//:com_google_protobuf_protobuf_javalite",
960-
],
961-
)
962-
963863
android_library(
964864
name = "cha_cha20_poly1305_key-android",
965865
srcs = ["ChaCha20Poly1305Key.java"],

‎java_src/src/main/java/com/google/crypto/tink/aead/AesEaxProtoSerialization.java ‎java_src/src/main/java/com/google/crypto/tink/aead/internal/AesEaxProtoSerialization.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,14 @@
1414
//
1515
////////////////////////////////////////////////////////////////////////////////
1616

17-
package com.google.crypto.tink.aead;
17+
package com.google.crypto.tink.aead.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;
23+
import com.google.crypto.tink.aead.AesEaxKey;
24+
import com.google.crypto.tink.aead.AesEaxParameters;
2325
import com.google.crypto.tink.internal.KeyParser;
2426
import com.google.crypto.tink.internal.KeySerializer;
2527
import com.google.crypto.tink.internal.MutableSerializationRegistry;
@@ -41,7 +43,7 @@
4143
/** Methods to serialize and parse {@link AesEaxKey} objects and {@link AesEaxParameters} objects */
4244
@AccessesPartialKey
4345
@SuppressWarnings("UnnecessarilyFullyQualified") // Fully specifying proto types is more readable
44-
final class AesEaxProtoSerialization {
46+
public final class AesEaxProtoSerialization {
4547
private static final String TYPE_URL = "type.googleapis.com/google.crypto.tink.AesEaxKey";
4648
private static final Bytes TYPE_URL_BYTES = toBytesFromPrintableAscii(TYPE_URL);
4749

‎java_src/src/main/java/com/google/crypto/tink/aead/AesGcmSivProtoSerialization.java ‎java_src/src/main/java/com/google/crypto/tink/aead/internal/AesGcmSivProtoSerialization.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,14 @@
1414
//
1515
////////////////////////////////////////////////////////////////////////////////
1616

17-
package com.google.crypto.tink.aead;
17+
package com.google.crypto.tink.aead.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;
23+
import com.google.crypto.tink.aead.AesGcmSivKey;
24+
import com.google.crypto.tink.aead.AesGcmSivParameters;
2325
import com.google.crypto.tink.internal.KeyParser;
2426
import com.google.crypto.tink.internal.KeySerializer;
2527
import com.google.crypto.tink.internal.MutableSerializationRegistry;
@@ -44,7 +46,7 @@
4446
*/
4547
@AccessesPartialKey
4648
@SuppressWarnings("UnnecessarilyFullyQualified") // Fully specifying proto types is more readable
47-
final class AesGcmSivProtoSerialization {
49+
public final class AesGcmSivProtoSerialization {
4850
private static final String TYPE_URL = "type.googleapis.com/google.crypto.tink.AesGcmSivKey";
4951
private static final Bytes TYPE_URL_BYTES = toBytesFromPrintableAscii(TYPE_URL);
5052

0 commit comments

Comments
 (0)