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

Merge "Keystore: EC_CURVE tag added import agruments" am: edce19fef7 am: 51c53d6357 am: 7811859715

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2164659

Change-Id: I81c11e5af30d15b7f1ea74e46c55d40e515f23ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Eran Messeri
2022-11-04 17:13:52 +00:00
committed by Automerger Merge Worker
parent 4e57753b2c 7811859715
commit 6a6a9e73fd
3 changed files with 68 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
keystore/java/android/security/keystore/KeyProperties.java
View File

@@ -30,6 +30,7 @@ import libcore.util.EmptyArray;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.security.spec.AlgorithmParameterSpec;
import java.security.spec.ECParameterSpec;
import java.security.spec.MGF1ParameterSpec;
import java.util.Collection;
import java.util.Locale;
@@ -913,6 +914,51 @@ public abstract class KeyProperties {
}
}
/**
* @hide
*/
public abstract static class EcCurve {
private EcCurve() {}
/**
* @hide
*/
public static int toKeymasterCurve(ECParameterSpec spec) {
int keySize = spec.getCurve().getField().getFieldSize();
switch (keySize) {
case 224:
return android.hardware.security.keymint.EcCurve.P_224;
case 256:
return android.hardware.security.keymint.EcCurve.P_256;
case 384:
return android.hardware.security.keymint.EcCurve.P_384;
case 521:
return android.hardware.security.keymint.EcCurve.P_521;
default:
return -1;
}
}
/**
* @hide
*/
public static int fromKeymasterCurve(int ecCurve) {
switch (ecCurve) {
case android.hardware.security.keymint.EcCurve.P_224:
return 224;
case android.hardware.security.keymint.EcCurve.P_256:
case android.hardware.security.keymint.EcCurve.CURVE_25519:
return 256;
case android.hardware.security.keymint.EcCurve.P_384:
return 384;
case android.hardware.security.keymint.EcCurve.P_521:
return 521;
default:
return -1;
}
}
}
/**
* Namespaces provide system developers and vendors with a way to use keystore without
* requiring an applications uid. Namespaces can be configured using SEPolicy.

5
keystore/java/android/security/keystore2/AndroidKeyStoreECDSASignatureSpi.java
View File

@@ -203,6 +203,11 @@ abstract class AndroidKeyStoreECDSASignatureSpi extends AndroidKeyStoreSignature
for (Authorization a : key.getAuthorizations()) {
if (a.keyParameter.tag == KeymasterDefs.KM_TAG_KEY_SIZE) {
keySizeBits = KeyStore2ParameterUtils.getUnsignedInt(a);
break;
} else if (a.keyParameter.tag == KeymasterDefs.KM_TAG_EC_CURVE) {
keySizeBits = KeyProperties.EcCurve.fromKeymasterCurve(
a.keyParameter.value.getEcCurve());
break;
}
}

17
keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java
View File

@@ -66,6 +66,7 @@ import java.security.cert.CertificateEncodingException;
import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
import java.security.cert.X509Certificate;
import java.security.interfaces.ECKey;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -566,6 +567,22 @@ public class AndroidKeyStoreSpi extends KeyStoreSpi {
spec.getMaxUsageCount()
));
}
if (KeyProperties.KEY_ALGORITHM_EC.equalsIgnoreCase(key.getAlgorithm())) {
if (key instanceof ECKey) {
ECKey ecKey = (ECKey) key;
importArgs.add(KeyStore2ParameterUtils.makeEnum(
KeymasterDefs.KM_TAG_EC_CURVE,
KeyProperties.EcCurve.toKeymasterCurve(ecKey.getParams())
));
}
}
/* TODO: check for Ed25519(EdDSA) or X25519(XDH) key algorithm and
* add import args for KM_TAG_EC_CURVE as EcCurve.CURVE_25519.
* Currently conscrypt does not support EdDSA key import and XDH keys are not an
* instance of XECKey, hence these conditions are not added, once it is fully
* implemented by conscrypt, we can add CURVE_25519 argument for EdDSA and XDH
* algorithms.
*/
} catch (IllegalArgumentException | IllegalStateException e) {
throw new KeyStoreException(e);
}