Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "No need to specify EC curve name in EcIesParameterSpec."

Browse Source
This commit is contained in:
Alex Klyubin
2015-04-14 20:22:51 +00:00
committed by Gerrit Code Review
parent ecfda06461 33454dd569
commit d693690aee
1 changed files with 2 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
keystore/java/android/security/EcIesParameterSpec.java
View File

@@ -85,11 +85,10 @@ public class EcIesParameterSpec implements AlgorithmParameterSpec {
} }
/** /**
* Default parameter spec: NIST P-256 curve (aka secp256r1 aka prime256v1), compressed point * Default parameter spec: compressed point format, {@code HKDFwithSHA256}, DEM uses 128-bit AES
* format, {@code HKDFwithSHA256}, DEM uses 128-bit AES GCM. * GCM.
*/ */
public static final EcIesParameterSpec DEFAULT = new EcIesParameterSpec( public static final EcIesParameterSpec DEFAULT = new EcIesParameterSpec(
"P-256",
PointFormat.COMPRESSED, PointFormat.COMPRESSED,
"HKDFwithSHA256", "HKDFwithSHA256",
"AES/GCM/NoPadding", "AES/GCM/NoPadding",
@@ -97,7 +96,6 @@ public class EcIesParameterSpec implements AlgorithmParameterSpec {
null, null,
0); 0);
private final String mKemCurveName;
private final @PointFormatEnum int mKemPointFormat; private final @PointFormatEnum int mKemPointFormat;
private final String mKemKdfAlgorithm; private final String mKemKdfAlgorithm;
private final String mDemCipherTransformation; private final String mDemCipherTransformation;
@@ -106,14 +104,12 @@ public class EcIesParameterSpec implements AlgorithmParameterSpec {
private final int mDemMacKeySize; private final int mDemMacKeySize;
private EcIesParameterSpec( private EcIesParameterSpec(
String kemCurveName,
@PointFormatEnum int kemPointFormat, @PointFormatEnum int kemPointFormat,
String kemKdfAlgorithm, String kemKdfAlgorithm,
String demCipherTransformation, String demCipherTransformation,
int demCipherKeySize, int demCipherKeySize,
String demMacAlgorithm, String demMacAlgorithm,
int demMacKeySize) { int demMacKeySize) {
mKemCurveName = kemCurveName;
mKemPointFormat = kemPointFormat; mKemPointFormat = kemPointFormat;
mKemKdfAlgorithm = kemKdfAlgorithm; mKemKdfAlgorithm = kemKdfAlgorithm;
mDemCipherTransformation = demCipherTransformation; mDemCipherTransformation = demCipherTransformation;
@@ -122,13 +118,6 @@ public class EcIesParameterSpec implements AlgorithmParameterSpec {
mDemMacKeySize = demMacKeySize; mDemMacKeySize = demMacKeySize;
} }
/**
* 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. * Returns KEM EC point wire format or {@link PointFormat#UNSPECIFIED} if not specified.
*/ */
@@ -188,7 +177,6 @@ public class EcIesParameterSpec implements AlgorithmParameterSpec {
* Builder of {@link EcIesParameterSpec}. * Builder of {@link EcIesParameterSpec}.
*/ */
public static class Builder { public static class Builder {
private String mKemCurveName;
private @PointFormatEnum int mKemPointFormat = PointFormat.UNSPECIFIED; private @PointFormatEnum int mKemPointFormat = PointFormat.UNSPECIFIED;
private String mKemKdfAlgorithm; private String mKemKdfAlgorithm;
private String mDemCipherTransformation; private String mDemCipherTransformation;
@@ -196,16 +184,6 @@ public class EcIesParameterSpec implements AlgorithmParameterSpec {
private String mDemMacAlgorithm; private String mDemMacAlgorithm;
private int mDemMacKeySize = -1; 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. * Sets KEM EC point wire format.
*/ */
@@ -274,7 +252,6 @@ public class EcIesParameterSpec implements AlgorithmParameterSpec {
public EcIesParameterSpec build() { public EcIesParameterSpec build() {
int demMacKeySize = (mDemMacKeySize != -1) ? mDemMacKeySize : mDemCipherKeySize; int demMacKeySize = (mDemMacKeySize != -1) ? mDemMacKeySize : mDemCipherKeySize;
return new EcIesParameterSpec( return new EcIesParameterSpec(
mKemCurveName,
mKemPointFormat, mKemPointFormat,
mKemKdfAlgorithm, mKemKdfAlgorithm,
mDemCipherTransformation, mDemCipherTransformation,