1 files changed, 14 insertions, 46 deletions
diff --git a/src/main/java/com/google/security/cryptauth/lib/securemessage/PublicKeyProtoUtil.java b/src/main/java/com/google/security/cryptauth/lib/securemessage/PublicKeyProtoUtil.java
index 0c593fe..ab97cca 100644
--- a/src/main/java/com/google/security/cryptauth/lib/securemessage/PublicKeyProtoUtil.java
+++ b/src/main/java/com/google/security/cryptauth/lib/securemessage/PublicKeyProtoUtil.java
@@ -1,20 +1,19 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     https://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
+/* Copyright 2018 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.google.security.cryptauth.lib.securemessage;
 
-import com.google.common.collect.Lists;
 import com.google.protobuf.ByteString;
 import com.google.security.annotations.SuppressInsecureCipherModeCheckerPendingReview;
 import com.google.security.cryptauth.lib.securemessage.SecureMessageProto.DhPublicKey;
@@ -195,37 +194,6 @@ public class PublicKeyProtoUtil {
   }
 
   /**
-   * Encodes an {@link ECPublicKey} to an {@link GenericPublicKey} proto message. The returned key
-   * has a null-byte padded to the front in order to match the C++ implementation.
-   */
-  public static GenericPublicKey encodePaddedEcPublicKey(PublicKey pk) {
-    if (pk == null) {
-      throw new NullPointerException();
-    }
-    if (!(pk instanceof ECPublicKey)) {
-      throw new IllegalArgumentException("Expected ECPublicKey PublicKey type");
-    }
-
-    ECPublicKey epk = pkToECPublicKey(pk);
-    ByteString nullByteString = ByteString.copyFrom(new byte[] {0});
-    ByteString xByteString = extractX(epk);
-    if (xByteString.size() < MAX_P256_ENCODING_BYTES) {
-      xByteString = ByteString.copyFrom(Lists.newArrayList(nullByteString, xByteString));
-    }
-    ByteString yByteString = extractY(epk);
-    if (yByteString.size() < MAX_P256_ENCODING_BYTES) {
-      yByteString = ByteString.copyFrom(Lists.newArrayList(nullByteString, yByteString));
-    }
-    EcP256PublicKey newKey =
-        EcP256PublicKey.newBuilder().setX(xByteString).setY(yByteString).build();
-
-    return GenericPublicKey.newBuilder()
-        .setType(SecureMessageProto.PublicKeyType.EC_P256)
-        .setEcP256PublicKey(newKey)
-        .build();
-  }
-
-  /**
    * Encodes an {@link ECPublicKey} to an {@link EcP256PublicKey} proto message.
    */
   public static EcP256PublicKey encodeEcPublicKey(PublicKey pk) {