diff options
Diffstat (limited to 'keystore/java/android/security/EcIesParameterSpec.java')
-rw-r--r-- | keystore/java/android/security/EcIesParameterSpec.java | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/keystore/java/android/security/EcIesParameterSpec.java b/keystore/java/android/security/EcIesParameterSpec.java index 3826679..a3e5aec 100644 --- a/keystore/java/android/security/EcIesParameterSpec.java +++ b/keystore/java/android/security/EcIesParameterSpec.java @@ -83,11 +83,10 @@ public class EcIesParameterSpec implements AlgorithmParameterSpec { } /** - * Default parameter spec: NIST P-256 curve (aka secp256r1 aka prime256v1), compressed point - * format, {@code HKDFwithSHA256}, DEM uses 128-bit AES GCM. + * Default parameter spec: compressed point format, {@code HKDFwithSHA256}, DEM uses 128-bit AES + * GCM. */ public static final EcIesParameterSpec DEFAULT = new EcIesParameterSpec( - "P-256", PointFormat.COMPRESSED, "HKDFwithSHA256", "AES/GCM/NoPadding", @@ -95,7 +94,6 @@ public class EcIesParameterSpec implements AlgorithmParameterSpec { null, 0); - private final String mKemCurveName; private final @PointFormatEnum int mKemPointFormat; private final String mKemKdfAlgorithm; private final String mDemCipherTransformation; @@ -104,14 +102,12 @@ public class EcIesParameterSpec implements AlgorithmParameterSpec { private final int mDemMacKeySize; private EcIesParameterSpec( - String kemCurveName, @PointFormatEnum int kemPointFormat, String kemKdfAlgorithm, String demCipherTransformation, int demCipherKeySize, String demMacAlgorithm, int demMacKeySize) { - mKemCurveName = kemCurveName; mKemPointFormat = kemPointFormat; mKemKdfAlgorithm = kemKdfAlgorithm; mDemCipherTransformation = demCipherTransformation; @@ -121,15 +117,6 @@ public class EcIesParameterSpec implements AlgorithmParameterSpec { } /** - * Returns KEM EC curve name (e.g., {@code secp256r1}) or {@code null} if not specified. - * - * @hide - */ - public String getKemCurveName() { - return mKemCurveName; - } - - /** * Returns KEM EC point wire format or {@link PointFormat#UNSPECIFIED} if not specified. */ public @PointFormatEnum int getKemPointFormat() { @@ -188,7 +175,6 @@ public class EcIesParameterSpec implements AlgorithmParameterSpec { * Builder of {@link EcIesParameterSpec}. */ public static class Builder { - private String mKemCurveName; private @PointFormatEnum int mKemPointFormat = PointFormat.UNSPECIFIED; private String mKemKdfAlgorithm; private String mDemCipherTransformation; @@ -197,18 +183,6 @@ public class EcIesParameterSpec implements AlgorithmParameterSpec { private int mDemMacKeySize = -1; /** - * Sets KEM EC curve name. For example, {@code P-256} or {@code secp256r1}. - * - * <p>NOTE: Only curves with cofactor of {@code 1} are supported. - * - * @hide - */ - public Builder setKemCurveName(String name) { - mKemCurveName = name; - return this; - } - - /** * Sets KEM EC point wire format. */ public Builder setKemPointFormat(@PointFormatEnum int pointFormat) { @@ -276,7 +250,6 @@ public class EcIesParameterSpec implements AlgorithmParameterSpec { public EcIesParameterSpec build() { int demMacKeySize = (mDemMacKeySize != -1) ? mDemMacKeySize : mDemCipherKeySize; return new EcIesParameterSpec( - mKemCurveName, mKemPointFormat, mKemKdfAlgorithm, mDemCipherTransformation, |