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

resolved conflicts for merge of 1d5a2592 to master

Browse Source 
Change-Id: Ia1ea7c9c8c23eeffcd596b96506e961989ccb7a6
This commit is contained in:
Alex Klyubin
2015-04-14 14:23:07 -07:00
parent 7caa691652 1d5a259276
commit 338e74648d
1 changed files with 2 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
@@ -120,15 +116,6 @@ public class EcIesParameterSpec implements AlgorithmParameterSpec {
mDemMacKeySize = demMacKeySize;
}
/**
* 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.
*/
@@ -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;
@@ -196,18 +182,6 @@ public class EcIesParameterSpec implements AlgorithmParameterSpec {
private String mDemMacAlgorithm;
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.
*/
@@ -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,