am d693690a: Merge "No need to specify EC curve name in EcIesParameterSpec."
* commit 'd693690aee3ee94878ab59ee86d8db8ce5bb3789':
No need to specify EC curve name in EcIesParameterSpec.
diff --git a/keystore/java/android/security/EcIesParameterSpec.java b/keystore/java/android/security/EcIesParameterSpec.java
index 0f19812..3372da9 100644
--- a/keystore/java/android/security/EcIesParameterSpec.java
+++ b/keystore/java/android/security/EcIesParameterSpec.java
@@ -85,11 +85,10 @@
}
/**
- * 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",
@@ -97,7 +96,6 @@
null,
0);
- private final String mKemCurveName;
private final @PointFormatEnum int mKemPointFormat;
private final String mKemKdfAlgorithm;
private final String mDemCipherTransformation;
@@ -106,14 +104,12 @@
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;
@@ -123,13 +119,6 @@
}
/**
- * Returns KEM EC curve name (e.g., {@code secp256r1}) or {@code null} if not specified.
- */
- public String getKemCurveName() {
- return mKemCurveName;
- }
-
- /**
* Returns KEM EC point wire format or {@link PointFormat#UNSPECIFIED} if not specified.
*/
public @PointFormatEnum int getKemPointFormat() {
@@ -188,7 +177,6 @@
* Builder of {@link EcIesParameterSpec}.
*/
public static class Builder {
- private String mKemCurveName;
private @PointFormatEnum int mKemPointFormat = PointFormat.UNSPECIFIED;
private String mKemKdfAlgorithm;
private String mDemCipherTransformation;
@@ -197,16 +185,6 @@
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.
- */
- public Builder setKemCurveName(String name) {
- mKemCurveName = name;
- return this;
- }
-
- /**
* Sets KEM EC point wire format.
*/
public Builder setKemPointFormat(@PointFormatEnum int pointFormat) {
@@ -274,7 +252,6 @@
public EcIesParameterSpec build() {
int demMacKeySize = (mDemMacKeySize != -1) ? mDemMacKeySize : mDemCipherKeySize;
return new EcIesParameterSpec(
- mKemCurveName,
mKemPointFormat,
mKemKdfAlgorithm,
mDemCipherTransformation,