From 270f07c63cab715c1f69ec40ad2229f4a8379748 Mon Sep 17 00:00:00 2001 From: tholenst Date: Tue, 9 Aug 2022 03:36:41 -0700 Subject: [PATCH] Migrate more instances of StandardCharsets to toBytesFromPrintableAscii. PiperOrigin-RevId: 466307621 --- .../src/main/java/com/google/crypto/tink/internal/BUILD.bazel | 2 ++ .../crypto/tink/internal/ProtoParametersSerialization.java | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/java_src/src/main/java/com/google/crypto/tink/internal/BUILD.bazel b/java_src/src/main/java/com/google/crypto/tink/internal/BUILD.bazel index 4c3e1592f1..212a304638 100644 --- a/java_src/src/main/java/com/google/crypto/tink/internal/BUILD.bazel +++ b/java_src/src/main/java/com/google/crypto/tink/internal/BUILD.bazel @@ -216,6 +216,7 @@ java_library( srcs = ["ProtoParametersSerialization.java"], deps = [ ":serialization", + ":util", "//proto:tink_java_proto", "//src/main/java/com/google/crypto/tink/util:bytes", "@com_google_protobuf//:protobuf_javalite", @@ -242,6 +243,7 @@ android_library( srcs = ["ProtoParametersSerialization.java"], deps = [ ":serialization-android", + ":util-android", "//proto:tink_java_proto_lite", "//src/main/java/com/google/crypto/tink/util:bytes-android", "@com_google_protobuf//:protobuf_javalite", diff --git a/java_src/src/main/java/com/google/crypto/tink/internal/ProtoParametersSerialization.java b/java_src/src/main/java/com/google/crypto/tink/internal/ProtoParametersSerialization.java index 90b914f679..06721e0930 100644 --- a/java_src/src/main/java/com/google/crypto/tink/internal/ProtoParametersSerialization.java +++ b/java_src/src/main/java/com/google/crypto/tink/internal/ProtoParametersSerialization.java @@ -16,7 +16,7 @@ package com.google.crypto.tink.internal; -import static java.nio.charset.StandardCharsets.UTF_8; +import static com.google.crypto.tink.internal.Util.toBytesFromPrintableAscii; import com.google.crypto.tink.proto.KeyTemplate; import com.google.crypto.tink.proto.OutputPrefixType; @@ -37,7 +37,7 @@ public final class ProtoParametersSerialization implements Serialization { private ProtoParametersSerialization(KeyTemplate keyTemplate) { this.keyTemplate = keyTemplate; - this.objectIdentifier = Bytes.copyFrom(keyTemplate.getTypeUrl().getBytes(UTF_8)); + this.objectIdentifier = toBytesFromPrintableAscii(keyTemplate.getTypeUrl()); } /** Creates a new {@code ProtoParametersSerialization} object from the individual parts. */