tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert^2 "Move keymint to android.hardware.security." am: 08a7e43e78

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1525190

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icf583a13e67e08e7d1d812544a3cdaa165d4ad3a
This commit is contained in:
Shawn Willden 2020-12-12 00:26:10 +00:00 committed by Automerger Merge Worker
commit dbd149504f
79 changed files with 294 additions and 448 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
compatibility_matrices/compatibility_matrix.current.xml
View file

@ -299,7 +299,7 @@
</interface> </interface>
</hal> </hal>
<hal format="aidl" optional="true"> <hal format="aidl" optional="true">
<name>android.hardware.keymint</name> <name>android.hardware.security.keymint</name>
<interface> <interface>
<name>IKeyMintDevice</name> <name>IKeyMintDevice</name>
<instance>default</instance> <instance>default</instance>

33
keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/IKeyMintDevice.aidl
View file

@ -1,33 +0,0 @@
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
///////////////////////////////////////////////////////////////////////////////
// This file is a snapshot of an AIDL interface (or parcelable). Do not try to
// edit this file. It looks like you are doing that because you have modified
// an AIDL interface in a backward-incompatible way, e.g., deleting a function
// from an interface or a field from a parcelable and it broke the build. That
// breakage is intended.
//
// You must not make a backward incompatible changes to the AIDL files built
// with the aidl_interface module type with versions property set. The module
// type is used to build AIDL files in a way that they can be used across
// independently updatable components of the system. If a device is shipped
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.keymint;
@VintfStability
interface IKeyMintDevice {
android.hardware.keymint.KeyMintHardwareInfo getHardwareInfo();
android.hardware.keymint.VerificationToken verifyAuthorization(in long challenge, in android.hardware.keymint.HardwareAuthToken token);
void addRngEntropy(in byte[] data);
void generateKey(in android.hardware.keymint.KeyParameter[] keyParams, out android.hardware.keymint.ByteArray generatedKeyBlob, out android.hardware.keymint.KeyCharacteristics generatedKeyCharacteristics, out android.hardware.keymint.Certificate[] outCertChain);
void importKey(in android.hardware.keymint.KeyParameter[] inKeyParams, in android.hardware.keymint.KeyFormat inKeyFormat, in byte[] inKeyData, out android.hardware.keymint.ByteArray outImportedKeyBlob, out android.hardware.keymint.KeyCharacteristics outImportedKeyCharacteristics, out android.hardware.keymint.Certificate[] outCertChain);
void importWrappedKey(in byte[] inWrappedKeyData, in byte[] inWrappingKeyBlob, in byte[] inMaskingKey, in android.hardware.keymint.KeyParameter[] inUnwrappingParams, in long inPasswordSid, in long inBiometricSid, out android.hardware.keymint.ByteArray outImportedKeyBlob, out android.hardware.keymint.KeyCharacteristics outImportedKeyCharacteristics);
byte[] upgradeKey(in byte[] inKeyBlobToUpgrade, in android.hardware.keymint.KeyParameter[] inUpgradeParams);
void deleteKey(in byte[] inKeyBlob);
void deleteAllKeys();
void destroyAttestationIds();
android.hardware.keymint.BeginResult begin(in android.hardware.keymint.KeyPurpose inPurpose, in byte[] inKeyBlob, in android.hardware.keymint.KeyParameter[] inParams, in android.hardware.keymint.HardwareAuthToken inAuthToken);
const int AUTH_TOKEN_MAC_LENGTH = 32;
}

3
keymint/aidl/default/android.hardware.keymint@1.0-service.rc
View file

@ -1,3 +0,0 @@
service vendor.keymint-default /vendor/bin/hw/android.hardware.keymint@1.0-service
class early_hal
user nobody

4
keymint/aidl/Android.bp → security/keymint/aidl/Android.bp
View file

@ -1,8 +1,8 @@
aidl_interface { aidl_interface {
name: "android.hardware.keymint", name: "android.hardware.security.keymint",
vendor_available: true, vendor_available: true,
srcs: [ srcs: [
"android/hardware/keymint/*.aidl", "android/hardware/security/keymint/*.aidl",
], ],
stability: "vintf", stability: "vintf",
backend: { backend: {

0
keymint/aidl/OWNERS → security/keymint/aidl/OWNERS
View file

2
keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/Algorithm.aidl → security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/Algorithm.aidl
View file

@ -15,7 +15,7 @@
// with such a backward incompatible change, it has a high risk of breaking // with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules. // later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.keymint; package android.hardware.security.keymint;
@Backing(type="int") @VintfStability @Backing(type="int") @VintfStability
enum Algorithm { enum Algorithm {
RSA = 1, RSA = 1,

6
keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/BeginResult.aidl → security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/BeginResult.aidl
View file

@ -15,10 +15,10 @@
// with such a backward incompatible change, it has a high risk of breaking // with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules. // later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.keymint; package android.hardware.security.keymint;
@VintfStability @VintfStability
parcelable BeginResult { parcelable BeginResult {
long challenge; long challenge;
android.hardware.keymint.KeyParameter[] params; android.hardware.security.keymint.KeyParameter[] params;
android.hardware.keymint.IKeyMintOperation operation; android.hardware.security.keymint.IKeyMintOperation operation;
} }

2
keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/BlockMode.aidl → security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/BlockMode.aidl
View file

@ -15,7 +15,7 @@
// with such a backward incompatible change, it has a high risk of breaking // with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules. // later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.keymint; package android.hardware.security.keymint;
@Backing(type="int") @VintfStability @Backing(type="int") @VintfStability
enum BlockMode { enum BlockMode {
ECB = 1, ECB = 1,

2
keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/ByteArray.aidl → security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/ByteArray.aidl
View file

@ -15,7 +15,7 @@
// with such a backward incompatible change, it has a high risk of breaking // with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules. // later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.keymint; package android.hardware.security.keymint;
@VintfStability @VintfStability
parcelable ByteArray { parcelable ByteArray {
byte[] data; byte[] data;

2
keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/Certificate.aidl → security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/Certificate.aidl
View file

@ -15,7 +15,7 @@
// with such a backward incompatible change, it has a high risk of breaking // with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules. // later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.keymint; package android.hardware.security.keymint;
@VintfStability @VintfStability
parcelable Certificate { parcelable Certificate {
byte[] encodedCertificate; byte[] encodedCertificate;

2
keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/Digest.aidl → security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/Digest.aidl
View file

@ -15,7 +15,7 @@
// with such a backward incompatible change, it has a high risk of breaking // with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules. // later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.keymint; package android.hardware.security.keymint;
@Backing(type="int") @VintfStability @Backing(type="int") @VintfStability
enum Digest { enum Digest {
NONE = 0, NONE = 0,

2
keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/EcCurve.aidl → security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/EcCurve.aidl
View file

@ -15,7 +15,7 @@
// with such a backward incompatible change, it has a high risk of breaking // with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules. // later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.keymint; package android.hardware.security.keymint;
@Backing(type="int") @VintfStability @Backing(type="int") @VintfStability
enum EcCurve { enum EcCurve {
P_224 = 0, P_224 = 0,

2
keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/ErrorCode.aidl → security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/ErrorCode.aidl
View file

@ -15,7 +15,7 @@
// with such a backward incompatible change, it has a high risk of breaking // with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules. // later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.keymint; package android.hardware.security.keymint;
@Backing(type="int") @VintfStability @Backing(type="int") @VintfStability
enum ErrorCode { enum ErrorCode {
OK = 0, OK = 0,

6
keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/HardwareAuthToken.aidl → security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/HardwareAuthToken.aidl
View file

@ -15,13 +15,13 @@
// with such a backward incompatible change, it has a high risk of breaking // with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules. // later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.keymint; package android.hardware.security.keymint;
@VintfStability @VintfStability
parcelable HardwareAuthToken { parcelable HardwareAuthToken {
long challenge; long challenge;
long userId; long userId;
long authenticatorId; long authenticatorId;
android.hardware.keymint.HardwareAuthenticatorType authenticatorType; android.hardware.security.keymint.HardwareAuthenticatorType authenticatorType;
android.hardware.keymint.Timestamp timestamp; android.hardware.security.keymint.Timestamp timestamp;
byte[] mac; byte[] mac;
} }

2
keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/HardwareAuthenticatorType.aidl → security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/HardwareAuthenticatorType.aidl
View file

@ -15,7 +15,7 @@
// with such a backward incompatible change, it has a high risk of breaking // with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules. // later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.keymint; package android.hardware.security.keymint;
@Backing(type="int") @VintfStability @Backing(type="int") @VintfStability
enum HardwareAuthenticatorType { enum HardwareAuthenticatorType {
NONE = 0, NONE = 0,

33
security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/IKeyMintDevice.aidl Normal file
View file

@ -0,0 +1,33 @@
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
///////////////////////////////////////////////////////////////////////////////
// This file is a snapshot of an AIDL interface (or parcelable). Do not try to
// edit this file. It looks like you are doing that because you have modified
// an AIDL interface in a backward-incompatible way, e.g., deleting a function
// from an interface or a field from a parcelable and it broke the build. That
// breakage is intended.
//
// You must not make a backward incompatible changes to the AIDL files built
// with the aidl_interface module type with versions property set. The module
// type is used to build AIDL files in a way that they can be used across
// independently updatable components of the system. If a device is shipped
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.security.keymint;
@VintfStability
interface IKeyMintDevice {
android.hardware.security.keymint.KeyMintHardwareInfo getHardwareInfo();
android.hardware.security.keymint.VerificationToken verifyAuthorization(in long challenge, in android.hardware.security.keymint.HardwareAuthToken token);
void addRngEntropy(in byte[] data);
void generateKey(in android.hardware.security.keymint.KeyParameter[] keyParams, out android.hardware.security.keymint.ByteArray generatedKeyBlob, out android.hardware.security.keymint.KeyCharacteristics generatedKeyCharacteristics, out android.hardware.security.keymint.Certificate[] outCertChain);
void importKey(in android.hardware.security.keymint.KeyParameter[] inKeyParams, in android.hardware.security.keymint.KeyFormat inKeyFormat, in byte[] inKeyData, out android.hardware.security.keymint.ByteArray outImportedKeyBlob, out android.hardware.security.keymint.KeyCharacteristics outImportedKeyCharacteristics, out android.hardware.security.keymint.Certificate[] outCertChain);
void importWrappedKey(in byte[] inWrappedKeyData, in byte[] inWrappingKeyBlob, in byte[] inMaskingKey, in android.hardware.security.keymint.KeyParameter[] inUnwrappingParams, in long inPasswordSid, in long inBiometricSid, out android.hardware.security.keymint.ByteArray outImportedKeyBlob, out android.hardware.security.keymint.KeyCharacteristics outImportedKeyCharacteristics);
byte[] upgradeKey(in byte[] inKeyBlobToUpgrade, in android.hardware.security.keymint.KeyParameter[] inUpgradeParams);
void deleteKey(in byte[] inKeyBlob);
void deleteAllKeys();
void destroyAttestationIds();
android.hardware.security.keymint.BeginResult begin(in android.hardware.security.keymint.KeyPurpose inPurpose, in byte[] inKeyBlob, in android.hardware.security.keymint.KeyParameter[] inParams, in android.hardware.security.keymint.HardwareAuthToken inAuthToken);
const int AUTH_TOKEN_MAC_LENGTH = 32;
}

6
keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/IKeyMintOperation.aidl → security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/IKeyMintOperation.aidl
View file

@ -15,10 +15,10 @@
// with such a backward incompatible change, it has a high risk of breaking // with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules. // later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.keymint; package android.hardware.security.keymint;
@VintfStability @VintfStability
interface IKeyMintOperation { interface IKeyMintOperation {
int update(in @nullable android.hardware.keymint.KeyParameterArray inParams, in @nullable byte[] input, in @nullable android.hardware.keymint.HardwareAuthToken inAuthToken, in @nullable android.hardware.keymint.VerificationToken inVerificationToken, out @nullable android.hardware.keymint.KeyParameterArray outParams, out @nullable android.hardware.keymint.ByteArray output); int update(in @nullable android.hardware.security.keymint.KeyParameterArray inParams, in @nullable byte[] input, in @nullable android.hardware.security.keymint.HardwareAuthToken inAuthToken, in @nullable android.hardware.security.keymint.VerificationToken inVerificationToken, out @nullable android.hardware.security.keymint.KeyParameterArray outParams, out @nullable android.hardware.security.keymint.ByteArray output);
byte[] finish(in @nullable android.hardware.keymint.KeyParameterArray inParams, in @nullable byte[] input, in @nullable byte[] inSignature, in @nullable android.hardware.keymint.HardwareAuthToken authToken, in @nullable android.hardware.keymint.VerificationToken inVerificationToken, out @nullable android.hardware.keymint.KeyParameterArray outParams); byte[] finish(in @nullable android.hardware.security.keymint.KeyParameterArray inParams, in @nullable byte[] input, in @nullable byte[] inSignature, in @nullable android.hardware.security.keymint.HardwareAuthToken authToken, in @nullable android.hardware.security.keymint.VerificationToken inVerificationToken, out @nullable android.hardware.security.keymint.KeyParameterArray outParams);
void abort(); void abort();
} }

6
keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/KeyCharacteristics.aidl → security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyCharacteristics.aidl
View file

@ -15,9 +15,9 @@
// with such a backward incompatible change, it has a high risk of breaking // with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules. // later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.keymint; package android.hardware.security.keymint;
@VintfStability @VintfStability
parcelable KeyCharacteristics { parcelable KeyCharacteristics {
android.hardware.keymint.KeyParameter[] softwareEnforced; android.hardware.security.keymint.KeyParameter[] softwareEnforced;
android.hardware.keymint.KeyParameter[] hardwareEnforced; android.hardware.security.keymint.KeyParameter[] hardwareEnforced;
} }

2
keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/KeyDerivationFunction.aidl → security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyDerivationFunction.aidl
View file

@ -15,7 +15,7 @@
// with such a backward incompatible change, it has a high risk of breaking // with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules. // later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.keymint; package android.hardware.security.keymint;
@Backing(type="int") @VintfStability @Backing(type="int") @VintfStability
enum KeyDerivationFunction { enum KeyDerivationFunction {
NONE = 0, NONE = 0,

2
keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/KeyFormat.aidl → security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyFormat.aidl
View file

@ -15,7 +15,7 @@
// with such a backward incompatible change, it has a high risk of breaking // with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules. // later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.keymint; package android.hardware.security.keymint;
@Backing(type="int") @VintfStability @Backing(type="int") @VintfStability
enum KeyFormat { enum KeyFormat {
X509 = 0, X509 = 0,

4
keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/KeyMintHardwareInfo.aidl → security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyMintHardwareInfo.aidl
View file

@ -15,11 +15,11 @@
// with such a backward incompatible change, it has a high risk of breaking // with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules. // later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.keymint; package android.hardware.security.keymint;
@VintfStability @VintfStability
parcelable KeyMintHardwareInfo { parcelable KeyMintHardwareInfo {
int versionNumber; int versionNumber;
android.hardware.keymint.SecurityLevel securityLevel; android.hardware.security.keymint.SecurityLevel securityLevel;
@utf8InCpp String keyMintName; @utf8InCpp String keyMintName;
@utf8InCpp String keyMintAuthorName; @utf8InCpp String keyMintAuthorName;
} }

2
keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/KeyOrigin.aidl → security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyOrigin.aidl
View file

@ -15,7 +15,7 @@
// with such a backward incompatible change, it has a high risk of breaking // with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules. // later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.keymint; package android.hardware.security.keymint;
@Backing(type="int") @VintfStability @Backing(type="int") @VintfStability
enum KeyOrigin { enum KeyOrigin {
GENERATED = 0, GENERATED = 0,

4
keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/KeyParameter.aidl → security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyParameter.aidl
View file

@ -15,10 +15,10 @@
// with such a backward incompatible change, it has a high risk of breaking // with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules. // later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.keymint; package android.hardware.security.keymint;
@VintfStability @VintfStability
parcelable KeyParameter { parcelable KeyParameter {
android.hardware.keymint.Tag tag; android.hardware.security.keymint.Tag tag;
boolean boolValue; boolean boolValue;
int integer; int integer;
long longInteger; long longInteger;

4
keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/KeyParameterArray.aidl → security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyParameterArray.aidl
View file

@ -15,8 +15,8 @@
// with such a backward incompatible change, it has a high risk of breaking // with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules. // later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.keymint; package android.hardware.security.keymint;
@VintfStability @VintfStability
parcelable KeyParameterArray { parcelable KeyParameterArray {
android.hardware.keymint.KeyParameter[] params; android.hardware.security.keymint.KeyParameter[] params;
} }

2
keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/KeyPurpose.aidl → security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/KeyPurpose.aidl
View file

@ -15,7 +15,7 @@
// with such a backward incompatible change, it has a high risk of breaking // with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules. // later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.keymint; package android.hardware.security.keymint;
@Backing(type="int") @VintfStability @Backing(type="int") @VintfStability
enum KeyPurpose { enum KeyPurpose {
ENCRYPT = 0, ENCRYPT = 0,

2
keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/PaddingMode.aidl → security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/PaddingMode.aidl
View file

@ -15,7 +15,7 @@
// with such a backward incompatible change, it has a high risk of breaking // with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules. // later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.keymint; package android.hardware.security.keymint;
@Backing(type="int") @VintfStability @Backing(type="int") @VintfStability
enum PaddingMode { enum PaddingMode {
NONE = 1, NONE = 1,

2
keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/SecurityLevel.aidl → security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/SecurityLevel.aidl
View file

@ -15,7 +15,7 @@
// with such a backward incompatible change, it has a high risk of breaking // with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules. // later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.keymint; package android.hardware.security.keymint;
@Backing(type="int") @VintfStability @Backing(type="int") @VintfStability
enum SecurityLevel { enum SecurityLevel {
SOFTWARE = 0, SOFTWARE = 0,

2
keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/Tag.aidl → security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/Tag.aidl
View file

@ -15,7 +15,7 @@
// with such a backward incompatible change, it has a high risk of breaking // with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules. // later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.keymint; package android.hardware.security.keymint;
@Backing(type="int") @VintfStability @Backing(type="int") @VintfStability
enum Tag { enum Tag {
INVALID = 0, INVALID = 0,

2
keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/TagType.aidl → security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/TagType.aidl
View file

@ -15,7 +15,7 @@
// with such a backward incompatible change, it has a high risk of breaking // with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules. // later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.keymint; package android.hardware.security.keymint;
@Backing(type="int") @VintfStability @Backing(type="int") @VintfStability
enum TagType { enum TagType {
INVALID = 0, INVALID = 0,

2
keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/Timestamp.aidl → security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/Timestamp.aidl
View file

@ -15,7 +15,7 @@
// with such a backward incompatible change, it has a high risk of breaking // with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules. // later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.keymint; package android.hardware.security.keymint;
@VintfStability @VintfStability
parcelable Timestamp { parcelable Timestamp {
long milliSeconds; long milliSeconds;

6
keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/VerificationToken.aidl → security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/VerificationToken.aidl
View file

@ -15,11 +15,11 @@
// with such a backward incompatible change, it has a high risk of breaking // with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules. // later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.keymint; package android.hardware.security.keymint;
@VintfStability @VintfStability
parcelable VerificationToken { parcelable VerificationToken {
long challenge; long challenge;
android.hardware.keymint.Timestamp timestamp; android.hardware.security.keymint.Timestamp timestamp;
android.hardware.keymint.SecurityLevel securityLevel; android.hardware.security.keymint.SecurityLevel securityLevel;
byte[] mac; byte[] mac;
} }

3
keymint/aidl/android/hardware/keymint/Algorithm.aidl → security/keymint/aidl/android/hardware/security/keymint/Algorithm.aidl
View file

@ -14,8 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package android.hardware.keymint; package android.hardware.security.keymint;
/** /**
* Algorithms provided by IKeyMintDevice implementations. * Algorithms provided by IKeyMintDevice implementations.

8
keymint/aidl/android/hardware/keymint/BeginResult.aidl → security/keymint/aidl/android/hardware/security/keymint/BeginResult.aidl
View file

@ -14,12 +14,10 @@
* limitations under the License. * limitations under the License.
*/ */
package android.hardware.keymint; package android.hardware.security.keymint;
import android.hardware.keymint.IKeyMintOperation;
import android.hardware.keymint.KeyParameter;
import android.hardware.security.keymint.IKeyMintOperation;
import android.hardware.security.keymint.KeyParameter;
/** /**
* This is all the results returned by the IKeyMintDevice begin() function. * This is all the results returned by the IKeyMintDevice begin() function.

3
keymint/aidl/android/hardware/keymint/BlockMode.aidl → security/keymint/aidl/android/hardware/security/keymint/BlockMode.aidl
View file

@ -14,8 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package android.hardware.keymint; package android.hardware.security.keymint;
/** /**
* Symmetric block cipher modes provided by IKeyMintDevice implementations. * Symmetric block cipher modes provided by IKeyMintDevice implementations.

3
keymint/aidl/android/hardware/keymint/ByteArray.aidl → security/keymint/aidl/android/hardware/security/keymint/ByteArray.aidl
View file

@ -14,8 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package android.hardware.keymint; package android.hardware.security.keymint;
/** /**
* This is used to contain a byte[], to make out parameters of byte arrays * This is used to contain a byte[], to make out parameters of byte arrays

2
keymint/aidl/android/hardware/keymint/Certificate.aidl → security/keymint/aidl/android/hardware/security/keymint/Certificate.aidl
View file

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package android.hardware.keymint; package android.hardware.security.keymint;
/** /**
* This encodes the IKeyMintDevice attestation generated certificate. * This encodes the IKeyMintDevice attestation generated certificate.

3
keymint/aidl/android/hardware/keymint/Digest.aidl → security/keymint/aidl/android/hardware/security/keymint/Digest.aidl
View file

@ -14,8 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package android.hardware.keymint; package android.hardware.security.keymint;
/** /**
* Digests provided by keyMint implementations. * Digests provided by keyMint implementations.

3
keymint/aidl/android/hardware/keymint/EcCurve.aidl → security/keymint/aidl/android/hardware/security/keymint/EcCurve.aidl
View file

@ -14,8 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package android.hardware.keymint; package android.hardware.security.keymint;
/** /**
* Supported EC curves, used in ECDSA * Supported EC curves, used in ECDSA

3
keymint/aidl/android/hardware/keymint/ErrorCode.aidl → security/keymint/aidl/android/hardware/security/keymint/ErrorCode.aidl
View file

@ -14,8 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package android.hardware.keymint; package android.hardware.security.keymint;
/** /**
* KeyMint error codes. Aidl will return these error codes as service specific * KeyMint error codes. Aidl will return these error codes as service specific

7
keymint/aidl/android/hardware/keymint/HardwareAuthToken.aidl → security/keymint/aidl/android/hardware/security/keymint/HardwareAuthToken.aidl
View file

@ -14,10 +14,10 @@
* limitations under the License. * limitations under the License.
*/ */
package android.hardware.keymint; package android.hardware.security.keymint;
import android.hardware.keymint.Timestamp; import android.hardware.security.keymint.Timestamp;
import android.hardware.keymint.HardwareAuthenticatorType; import android.hardware.security.keymint.HardwareAuthenticatorType;
/** /**
* HardwareAuthToken is used to prove successful user authentication, to unlock the use of a key. * HardwareAuthToken is used to prove successful user authentication, to unlock the use of a key.
@ -30,7 +30,6 @@ import android.hardware.keymint.HardwareAuthenticatorType;
*/ */
@VintfStability @VintfStability
parcelable HardwareAuthToken { parcelable HardwareAuthToken {
/** /**
* challenge is a value that's used to enable authentication tokens to authorize specific * challenge is a value that's used to enable authentication tokens to authorize specific
* events. The primary use case for challenge is to authorize an IKeyMintDevice cryptographic * events. The primary use case for challenge is to authorize an IKeyMintDevice cryptographic

2
keymint/aidl/android/hardware/keymint/HardwareAuthenticatorType.aidl → security/keymint/aidl/android/hardware/security/keymint/HardwareAuthenticatorType.aidl
View file

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package android.hardware.keymint; package android.hardware.security.keymint;
/** /**
* Hardware authentication type, used by HardwareAuthTokens to specify the mechanism used to * Hardware authentication type, used by HardwareAuthTokens to specify the mechanism used to

26
keymint/aidl/android/hardware/keymint/IKeyMintDevice.aidl → security/keymint/aidl/android/hardware/security/keymint/IKeyMintDevice.aidl
View file

@ -14,20 +14,20 @@
* limitations under the License. * limitations under the License.
*/ */
package android.hardware.keymint; package android.hardware.security.keymint;
import android.hardware.keymint.BeginResult; import android.hardware.security.keymint.BeginResult;
import android.hardware.keymint.ByteArray; import android.hardware.security.keymint.ByteArray;
import android.hardware.keymint.Certificate; import android.hardware.security.keymint.Certificate;
import android.hardware.keymint.HardwareAuthToken; import android.hardware.security.keymint.HardwareAuthToken;
import android.hardware.keymint.IKeyMintOperation; import android.hardware.security.keymint.IKeyMintOperation;
import android.hardware.keymint.KeyCharacteristics; import android.hardware.security.keymint.KeyCharacteristics;
import android.hardware.keymint.KeyFormat; import android.hardware.security.keymint.KeyFormat;
import android.hardware.keymint.KeyParameter; import android.hardware.security.keymint.KeyParameter;
import android.hardware.keymint.KeyMintHardwareInfo; import android.hardware.security.keymint.KeyMintHardwareInfo;
import android.hardware.keymint.KeyPurpose; import android.hardware.security.keymint.KeyPurpose;
import android.hardware.keymint.SecurityLevel; import android.hardware.security.keymint.SecurityLevel;
import android.hardware.keymint.VerificationToken; import android.hardware.security.keymint.VerificationToken;
/** /**
* KeyMint device definition. * KeyMint device definition.

12
keymint/aidl/android/hardware/keymint/IKeyMintOperation.aidl → security/keymint/aidl/android/hardware/security/keymint/IKeyMintOperation.aidl
View file

@ -14,13 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
package android.hardware.keymint; package android.hardware.security.keymint;
import android.hardware.keymint.ByteArray; import android.hardware.security.keymint.ByteArray;
import android.hardware.keymint.HardwareAuthToken; import android.hardware.security.keymint.HardwareAuthToken;
import android.hardware.keymint.KeyParameter; import android.hardware.security.keymint.KeyParameter;
import android.hardware.keymint.KeyParameterArray; import android.hardware.security.keymint.KeyParameterArray;
import android.hardware.keymint.VerificationToken; import android.hardware.security.keymint.VerificationToken;
@VintfStability @VintfStability
interface IKeyMintOperation { interface IKeyMintOperation {

4
keymint/aidl/android/hardware/keymint/KeyCharacteristics.aidl → security/keymint/aidl/android/hardware/security/keymint/KeyCharacteristics.aidl
View file

@ -14,9 +14,9 @@
* limitations under the License. * limitations under the License.
*/ */
package android.hardware.keymint; package android.hardware.security.keymint;
import android.hardware.keymint.KeyParameter; import android.hardware.security.keymint.KeyParameter;
/** /**
* KeyCharacteristics defines the attributes of a key, including cryptographic parameters, and usage * KeyCharacteristics defines the attributes of a key, including cryptographic parameters, and usage

2
keymint/aidl/android/hardware/keymint/KeyDerivationFunction.aidl → security/keymint/aidl/android/hardware/security/keymint/KeyDerivationFunction.aidl
View file

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package android.hardware.keymint; package android.hardware.security.keymint;
/** /**
* Key derivation functions, mostly used in ECIES. * Key derivation functions, mostly used in ECIES.

3
keymint/aidl/android/hardware/keymint/KeyFormat.aidl → security/keymint/aidl/android/hardware/security/keymint/KeyFormat.aidl
View file

@ -14,8 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package android.hardware.keymint; package android.hardware.security.keymint;
/** /**
* Formats for key import and export. * Formats for key import and export.

6
keymint/aidl/android/hardware/keymint/KeyMintHardwareInfo.aidl → security/keymint/aidl/android/hardware/security/keymint/KeyMintHardwareInfo.aidl
View file

@ -14,15 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
package android.hardware.keymint; package android.hardware.security.keymint;
import android.hardware.keymint.SecurityLevel;
import android.hardware.security.keymint.SecurityLevel;
/** /**
* KeyMintHardwareInfo is the hardware information returned by calling KeyMint getHardwareInfo() * KeyMintHardwareInfo is the hardware information returned by calling KeyMint getHardwareInfo()
*/ */
@VintfStability @VintfStability
parcelable KeyMintHardwareInfo { parcelable KeyMintHardwareInfo {
/** /**

3
keymint/aidl/android/hardware/keymint/KeyOrigin.aidl → security/keymint/aidl/android/hardware/security/keymint/KeyOrigin.aidl
View file

@ -14,8 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package android.hardware.keymint; package android.hardware.security.keymint;
/** /**
* The origin of a key (or pair), i.e. where it was generated. Note that ORIGIN can be found in * The origin of a key (or pair), i.e. where it was generated. Note that ORIGIN can be found in

25
keymint/aidl/android/hardware/keymint/KeyParameter.aidl → security/keymint/aidl/android/hardware/security/keymint/KeyParameter.aidl
View file

@ -14,20 +14,19 @@
* limitations under the License. * limitations under the License.
*/ */
package android.hardware.keymint; package android.hardware.security.keymint;
import android.hardware.security.keymint.Algorithm;
import android.hardware.keymint.Algorithm; import android.hardware.security.keymint.BlockMode;
import android.hardware.keymint.BlockMode; import android.hardware.security.keymint.Digest;
import android.hardware.keymint.Digest; import android.hardware.security.keymint.EcCurve;
import android.hardware.keymint.EcCurve; import android.hardware.security.keymint.HardwareAuthenticatorType;
import android.hardware.keymint.HardwareAuthenticatorType; import android.hardware.security.keymint.KeyDerivationFunction;
import android.hardware.keymint.KeyDerivationFunction; import android.hardware.security.keymint.KeyOrigin;
import android.hardware.keymint.KeyOrigin; import android.hardware.security.keymint.KeyPurpose;
import android.hardware.keymint.KeyPurpose; import android.hardware.security.keymint.PaddingMode;
import android.hardware.keymint.PaddingMode; import android.hardware.security.keymint.SecurityLevel;
import android.hardware.keymint.SecurityLevel; import android.hardware.security.keymint.Tag;
import android.hardware.keymint.Tag;
/** /**

4
keymint/aidl/android/hardware/keymint/KeyParameterArray.aidl → security/keymint/aidl/android/hardware/security/keymint/KeyParameterArray.aidl
View file

@ -14,9 +14,9 @@
* limitations under the License. * limitations under the License.
*/ */
package android.hardware.keymint; package android.hardware.security.keymint;
import android.hardware.keymint.KeyParameter; import android.hardware.security.keymint.KeyParameter;
/** /**
* Identifies the key authorization parameters to be used with keyMint. This is usually * Identifies the key authorization parameters to be used with keyMint. This is usually

2
keymint/aidl/android/hardware/keymint/KeyPurpose.aidl → security/keymint/aidl/android/hardware/security/keymint/KeyPurpose.aidl
View file

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package android.hardware.keymint; package android.hardware.security.keymint;
/** /**

2
keymint/aidl/android/hardware/keymint/PaddingMode.aidl → security/keymint/aidl/android/hardware/security/keymint/PaddingMode.aidl
View file

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package android.hardware.keymint; package android.hardware.security.keymint;
/** /**
* TODO(seleneh) update the description. * TODO(seleneh) update the description.

2
keymint/aidl/android/hardware/keymint/SecurityLevel.aidl → security/keymint/aidl/android/hardware/security/keymint/SecurityLevel.aidl
View file

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package android.hardware.keymint; package android.hardware.security.keymint;
/** /**
* Device security levels. * Device security levels.

4
keymint/aidl/android/hardware/keymint/Tag.aidl → security/keymint/aidl/android/hardware/security/keymint/Tag.aidl
View file

@ -14,9 +14,9 @@
* limitations under the License. * limitations under the License.
*/ */
package android.hardware.keymint; package android.hardware.security.keymint;
import android.hardware.keymint.TagType; import android.hardware.security.keymint.TagType;
// TODO(seleneh) : note aidl currently does not support double nested enum definitions such as // TODO(seleneh) : note aidl currently does not support double nested enum definitions such as
// ROOT_OF_TRUST = TagType:BYTES | 704. So we are forced to write definations as // ROOT_OF_TRUST = TagType:BYTES | 704. So we are forced to write definations as

2
keymint/aidl/android/hardware/keymint/TagType.aidl → security/keymint/aidl/android/hardware/security/keymint/TagType.aidl
View file

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package android.hardware.keymint; package android.hardware.security.keymint;
/** /**
* TagType classifies Tags in Tag.aidl into various groups of data. * TagType classifies Tags in Tag.aidl into various groups of data.

2
keymint/aidl/android/hardware/keymint/Timestamp.aidl → security/keymint/aidl/android/hardware/security/keymint/Timestamp.aidl
View file

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package android.hardware.keymint; package android.hardware.security.keymint;
/** /**
* Time in milliseconds since some arbitrary point in time. Time must be monotonically increasing, * Time in milliseconds since some arbitrary point in time. Time must be monotonically increasing,

13
keymint/aidl/android/hardware/keymint/VerificationToken.aidl → security/keymint/aidl/android/hardware/security/keymint/VerificationToken.aidl
View file

@ -14,10 +14,10 @@
* limitations under the License. * limitations under the License.
*/ */
package android.hardware.keymint; package android.hardware.security.keymint;
import android.hardware.keymint.SecurityLevel; import android.hardware.security.keymint.SecurityLevel;
import android.hardware.keymint.Timestamp; import android.hardware.security.keymint.Timestamp;
/** /**
* VerificationToken instances are used for secure environments to authenticate one another. * VerificationToken instances are used for secure environments to authenticate one another.
@ -48,7 +48,7 @@ parcelable VerificationToken {
* 32-byte HMAC-SHA256 of the above values, computed as: * 32-byte HMAC-SHA256 of the above values, computed as:
* *
* HMAC(H, * HMAC(H,
* "Auth Verification" || challenge || timestamp || securityLevel || parametersVerified) * "Auth Verification" || challenge || timestamp || securityLevel)
* *
* where: * where:
* *
@ -58,11 +58,6 @@ parcelable VerificationToken {
* *
* The representation of challenge and timestamp is as 64-bit unsigned integers in big-endian * The representation of challenge and timestamp is as 64-bit unsigned integers in big-endian
* order. securityLevel is represented as a 32-bit unsigned integer in big-endian order. * order. securityLevel is represented as a 32-bit unsigned integer in big-endian order.
*
* If parametersVerified is non-empty, the representation of parametersVerified is an ASN.1 DER
* encoded representation of the values. The ASN.1 schema used is the AuthorizationList schema
* from the Keystore attestation documentation. If parametersVerified is empty, it is simply
* omitted from the HMAC computation.
*/ */
byte[] mac; byte[] mac;
} }

12
keymint/aidl/default/Android.bp → security/keymint/aidl/default/Android.bp
View file

@ -1,22 +1,22 @@
cc_binary { cc_binary {
name: "android.hardware.keymint@1.0-service", name: "android.hardware.security.keymint-service",
relative_install_path: "hw", relative_install_path: "hw",
init_rc: ["android.hardware.keymint@1.0-service.rc"], init_rc: ["android.hardware.security.keymint-service.rc"],
vintf_fragments: ["android.hardware.keymint@1.0-service.xml"], vintf_fragments: ["android.hardware.security.keymint-service.xml"],
vendor: true, vendor: true,
cflags: [ cflags: [
"-Wall", "-Wall",
"-Wextra", "-Wextra",
], ],
shared_libs: [ shared_libs: [
"android.hardware.keymint-ndk_platform", "android.hardware.security.keymint-ndk_platform",
"libbase", "libbase",
"libbinder_ndk", "libbinder_ndk",
"libcppbor", "libcppbor",
"libcrypto", "libcrypto",
"liblog",
"libkeymaster_portable", "libkeymaster_portable",
"libkeymint1", "libkeymint",
"liblog",
"libpuresoftkeymasterdevice", "libpuresoftkeymasterdevice",
"libutils", "libutils",
], ],

3
security/keymint/aidl/default/android.hardware.security.keymint-service.rc Normal file
View file

@ -0,0 +1,3 @@
service vendor.keymint-default /vendor/bin/hw/android.hardware.security.keymint-service
class early_hal
user nobody

2
keymint/aidl/default/android.hardware.keymint@1.0-service.xml → security/keymint/aidl/default/android.hardware.security.keymint-service.xml
View file

@ -1,6 +1,6 @@
<manifest version="1.0" type="device"> <manifest version="1.0" type="device">
<hal format="aidl"> <hal format="aidl">
<name>android.hardware.keymint</name> <name>android.hardware.security.keymint</name>
<fqname>IKeyMintDevice/default</fqname> <fqname>IKeyMintDevice/default</fqname>
</hal> </hal>
</manifest> </manifest>

16
keymint/aidl/default/service.cpp → security/keymint/aidl/default/service.cpp
View file

@ -14,30 +14,30 @@
* limitations under the License. * limitations under the License.
*/ */
#define LOG_TAG "android.hardware.keymint1-service" #define LOG_TAG "android.hardware.security.keymint-service"
#include <android-base/logging.h> #include <android-base/logging.h>
#include <android/binder_manager.h> #include <android/binder_manager.h>
#include <android/binder_process.h> #include <android/binder_process.h>
#include <AndroidKeyMint1Device.h> #include <AndroidKeyMintDevice.h>
#include <keymaster/soft_keymaster_logger.h> #include <keymaster/soft_keymaster_logger.h>
using aidl::android::hardware::keymint::SecurityLevel; using aidl::android::hardware::security::keymint::AndroidKeyMintDevice;
using aidl::android::hardware::keymint::V1_0::AndroidKeyMint1Device; using aidl::android::hardware::security::keymint::SecurityLevel;
int main() { int main() {
// Zero threads seems like a useless pool, but below we'll join this thread to it, increasing // Zero threads seems like a useless pool, but below we'll join this thread to it, increasing
// the pool size to 1. // the pool size to 1.
ABinderProcess_setThreadPoolMaxThreadCount(0); ABinderProcess_setThreadPoolMaxThreadCount(0);
std::shared_ptr<AndroidKeyMint1Device> km5 = std::shared_ptr<AndroidKeyMintDevice> keyMint =
ndk::SharedRefBase::make<AndroidKeyMint1Device>(SecurityLevel::SOFTWARE); ndk::SharedRefBase::make<AndroidKeyMintDevice>(SecurityLevel::SOFTWARE);
keymaster::SoftKeymasterLogger logger; keymaster::SoftKeymasterLogger logger;
const auto instanceName = std::string(AndroidKeyMint1Device::descriptor) + "/default"; const auto instanceName = std::string(AndroidKeyMintDevice::descriptor) + "/default";
LOG(INFO) << "instance: " << instanceName; LOG(INFO) << "instance: " << instanceName;
binder_status_t status = binder_status_t status =
AServiceManager_addService(km5->asBinder().get(), instanceName.c_str()); AServiceManager_addService(keyMint->asBinder().get(), instanceName.c_str());
CHECK(status == STATUS_OK); CHECK(status == STATUS_OK);
ABinderProcess_joinThreadPool(); ABinderProcess_joinThreadPool();

22
keymint/aidl/vts/functional/Android.bp → security/keymint/aidl/vts/functional/Android.bp
View file

@ -15,25 +15,25 @@
// //
cc_test { cc_test {
name: "VtsAidlKeyMintV1_0TargetTest", name: "VtsAidlKeyMintTargetTest",
defaults: [ defaults: [
"VtsHalTargetTestDefaults", "VtsHalTargetTestDefaults",
"use_libaidlvintf_gtest_helper_static", "use_libaidlvintf_gtest_helper_static",
], ],
srcs: [ srcs: [
"keyMint1Test.cpp", "KeyMintTest.cpp",
"VerificationTokenTest.cpp", "VerificationTokenTest.cpp",
], ],
shared_libs: [ shared_libs: [
"libbinder", "libbinder",
"libcrypto", "libcrypto",
"libkeymint1", "libkeymint",
"libkeymintSupport", "libkeymint_support",
], ],
static_libs: [ static_libs: [
"android.hardware.keymint-cpp", "android.hardware.security.keymint-cpp",
"libcppbor", "libcppbor_external",
"libkeyMint1VtsTestUtil", "libkeymint_vts_test_utils",
], ],
test_suites: [ test_suites: [
"general-tests", "general-tests",
@ -42,7 +42,7 @@ cc_test {
} }
cc_test_library { cc_test_library {
name: "libkeyMint1VtsTestUtil", name: "libkeymint_vts_test_utils",
defaults: [ defaults: [
"VtsHalTargetTestDefaults", "VtsHalTargetTestDefaults",
"use_libaidlvintf_gtest_helper_static", "use_libaidlvintf_gtest_helper_static",
@ -56,11 +56,11 @@ cc_test_library {
shared_libs: [ shared_libs: [
"libbinder", "libbinder",
"libcrypto", "libcrypto",
"libkeymint1", "libkeymint",
"libkeymintSupport", "libkeymint_support",
], ],
static_libs: [ static_libs: [
"android.hardware.keymint-cpp", "android.hardware.security.keymint-cpp",
"libcppbor", "libcppbor",
], ],
} }

0
keymint/aidl/vts/functional/AndroidTest.xml → security/keymint/aidl/vts/functional/AndroidTest.xml
View file

13
keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp → security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp
View file

@ -21,12 +21,10 @@
#include <android-base/logging.h> #include <android-base/logging.h>
#include <keymintSupport/key_param_output.h> #include <keymint_support/key_param_output.h>
#include <keymintSupport/keymint_utils.h> #include <keymint_support/keymint_utils.h>
namespace android { namespace android::hardware::security::keymint {
namespace hardware {
namespace keymint {
using namespace std::literals::chrono_literals; using namespace std::literals::chrono_literals;
using std::endl; using std::endl;
@ -751,6 +749,5 @@ vector<Digest> KeyMintAidlTestBase::ValidDigests(bool withNone, bool withMD5) {
} }
} // namespace test } // namespace test
} // namespace keymint
} // namespace hardware } // namespace android::hardware::security::keymint
} // namespace android

16
keymint/aidl/vts/functional/KeyMintAidlTestBase.h → security/keymint/aidl/vts/functional/KeyMintAidlTestBase.h
View file

@ -21,18 +21,15 @@
#include <aidl/Gtest.h> #include <aidl/Gtest.h>
#include <aidl/Vintf.h> #include <aidl/Vintf.h>
#include <android/hardware/keymint/ErrorCode.h> #include <android/hardware/security/keymint/ErrorCode.h>
#include <android/hardware/keymint/IKeyMintDevice.h> #include <android/hardware/security/keymint/IKeyMintDevice.h>
#include <binder/IServiceManager.h> #include <binder/IServiceManager.h>
#include <binder/ProcessState.h> #include <binder/ProcessState.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <keymintSupport/authorization_set.h> #include <keymint_support/authorization_set.h>
namespace android { namespace android::hardware::security::keymint::test {
namespace hardware {
namespace keymint {
namespace test {
using ::android::sp; using ::android::sp;
using binder::Status; using binder::Status;
@ -189,9 +186,6 @@ class KeyMintAidlTestBase : public ::testing::TestWithParam<string> {
testing::ValuesIn(KeyMintAidlTestBase::build_params()), \ testing::ValuesIn(KeyMintAidlTestBase::build_params()), \
android::PrintInstanceNameToString) android::PrintInstanceNameToString)
} // namespace test } // namespace android::hardware::security::keymint::test
} // namespace keymint
} // namespace hardware
} // namespace android
#endif // VTS_KEYMINT_AIDL_TEST_UTILS_H #endif // VTS_KEYMINT_AIDL_TEST_UTILS_H

41
keymint/aidl/vts/functional/keyMint1Test.cpp → security/keymint/aidl/vts/functional/KeyMintTest.cpp
View file

@ -26,36 +26,32 @@
#include <cutils/properties.h> #include <cutils/properties.h>
#include <android/hardware/keymint/KeyFormat.h> #include <android/hardware/security/keymint/KeyFormat.h>
#include <keymintSupport/attestation_record.h> #include <keymint_support/attestation_record.h>
#include <keymintSupport/key_param_output.h> #include <keymint_support/key_param_output.h>
#include <keymintSupport/openssl_utils.h> #include <keymint_support/openssl_utils.h>
#include "KeyMintAidlTestBase.h" #include "KeyMintAidlTestBase.h"
static bool arm_deleteAllKeys = false; static bool arm_deleteAllKeys = false;
static bool dump_Attestations = false; static bool dump_Attestations = false;
using android::hardware::keymint::AuthorizationSet; using android::hardware::security::keymint::AuthorizationSet;
using android::hardware::keymint::KeyCharacteristics; using android::hardware::security::keymint::KeyCharacteristics;
using android::hardware::keymint::KeyFormat; using android::hardware::security::keymint::KeyFormat;
namespace android { namespace android::hardware::security::keymint {
namespace hardware {
namespace keymint {
bool operator==(const keymint::AuthorizationSet& a, const keymint::AuthorizationSet& b) { bool operator==(const keymint::AuthorizationSet& a, const keymint::AuthorizationSet& b) {
return a.size() == b.size() && std::equal(a.begin(), a.end(), b.begin()); return a.size() == b.size() && std::equal(a.begin(), a.end(), b.begin());
} }
} // namespace keymint
} // namespace hardware } // namespace android::hardware::security::keymint
} // namespace android
namespace std { namespace std {
using namespace android::hardware::keymint; using namespace android::hardware::security::keymint;
template <> template <>
struct std::equal_to<KeyCharacteristics> { struct std::equal_to<KeyCharacteristics> {
@ -77,10 +73,8 @@ struct std::equal_to<KeyCharacteristics> {
} // namespace std } // namespace std
namespace android { namespace android::hardware::security::keymint::test {
namespace hardware {
namespace keymint {
namespace test {
namespace { namespace {
template <TagType tag_type, Tag tag, typename ValueT> template <TagType tag_type, Tag tag, typename ValueT>
@ -4046,10 +4040,7 @@ TEST_P(TransportLimitTest, LargeFinishInput) {
INSTANTIATE_KEYMINT_AIDL_TEST(TransportLimitTest); INSTANTIATE_KEYMINT_AIDL_TEST(TransportLimitTest);
} // namespace test } // namespace android::hardware::security::keymint::test
} // namespace keymint
} // namespace hardware
} // namespace android
int main(int argc, char** argv) { int main(int argc, char** argv) {
::testing::InitGoogleTest(&argc, argv); ::testing::InitGoogleTest(&argc, argv);
@ -4063,7 +4054,5 @@ int main(int argc, char** argv) {
} }
} }
} }
int status = RUN_ALL_TESTS(); return RUN_ALL_TESTS();
ALOGI("Test result = %d", status);
return status;
} }

10
keymint/aidl/vts/functional/VerificationTokenTest.cpp → security/keymint/aidl/vts/functional/VerificationTokenTest.cpp
View file

@ -16,10 +16,7 @@
#include "KeyMintAidlTestBase.h" #include "KeyMintAidlTestBase.h"
namespace android { namespace android::hardware::security::keymint::test {
namespace hardware {
namespace keymint {
namespace test {
class VerificationTokenTest : public KeyMintAidlTestBase { class VerificationTokenTest : public KeyMintAidlTestBase {
protected: protected:
@ -168,7 +165,4 @@ TEST_P(VerificationTokenTest, MacChangesOnChangingTimestamp) {
INSTANTIATE_KEYMINT_AIDL_TEST(VerificationTokenTest); INSTANTIATE_KEYMINT_AIDL_TEST(VerificationTokenTest);
} // namespace test } // namespace android::hardware::security::keymint::test
} // namespace keymint
} // namespace hardware
} // namespace android

4
keymint/support/Android.bp → security/keymint/support/Android.bp
View file

@ -15,7 +15,7 @@
// //
cc_library { cc_library {
name: "libkeymintSupport", name: "libkeymint_support",
cflags: [ cflags: [
"-Wall", "-Wall",
"-Wextra", "-Wextra",
@ -31,7 +31,7 @@ cc_library {
"include", "include",
], ],
shared_libs: [ shared_libs: [
"android.hardware.keymint-cpp", "android.hardware.security.keymint-cpp",
"libbase", "libbase",
"libcrypto", "libcrypto",
"libutils", "libutils",

0
keymint/support/OWNERS → security/keymint/support/OWNERS
View file

21
keymint/support/attestation_record.cpp → security/keymint/support/attestation_record.cpp
View file

@ -14,27 +14,26 @@
* limitations under the License. * limitations under the License.
*/ */
#include <keymintSupport/attestation_record.h> #include <keymint_support/attestation_record.h>
#include <android/hardware/keymint/Tag.h> #include <assert.h>
#include <android/hardware/keymint/TagType.h>
#include <android-base/logging.h> #include <android-base/logging.h>
#include <assert.h>
#include <openssl/asn1t.h> #include <openssl/asn1t.h>
#include <openssl/bn.h> #include <openssl/bn.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/x509.h> #include <openssl/x509.h>
#include <keymintSupport/authorization_set.h> #include <android/hardware/security/keymint/Tag.h>
#include <keymintSupport/openssl_utils.h> #include <android/hardware/security/keymint/TagType.h>
#include <keymint_support/authorization_set.h>
#include <keymint_support/openssl_utils.h>
#define AT __FILE__ ":" << __LINE__ #define AT __FILE__ ":" << __LINE__
namespace android { namespace android::hardware::security::keymint {
namespace hardware {
namespace keymint {
struct stack_st_ASN1_TYPE_Delete { struct stack_st_ASN1_TYPE_Delete {
void operator()(stack_st_ASN1_TYPE* p) { sk_ASN1_TYPE_free(p); } void operator()(stack_st_ASN1_TYPE* p) { sk_ASN1_TYPE_free(p); }
@ -382,6 +381,4 @@ ErrorCode parse_root_of_trust(const uint8_t* asn1_key_desc, size_t asn1_key_desc
return ErrorCode::OK; // KM_ERROR_OK; return ErrorCode::OK; // KM_ERROR_OK;
} }
} // namespace keymint } // namespace android::hardware::security::keymint
} // namespace hardware
} // namespace android

39
keymint/support/authorization_set.cpp → security/keymint/support/authorization_set.cpp
View file

@ -14,23 +14,21 @@
* limitations under the License. * limitations under the License.
*/ */
#include <keymintSupport/authorization_set.h> #include <keymint_support/authorization_set.h>
#include <assert.h> #include <assert.h>
#include <android-base/logging.h>
#include <sstream> #include <sstream>
#include <android/hardware/keymint/Algorithm.h> #include <android-base/logging.h>
#include <android/hardware/keymint/BlockMode.h>
#include <android/hardware/keymint/Digest.h>
#include <android/hardware/keymint/KeyParameter.h>
#include <android/hardware/keymint/KeyPurpose.h>
#include <android/hardware/keymint/TagType.h>
namespace android { #include <android/hardware/security/keymint/Algorithm.h>
namespace hardware { #include <android/hardware/security/keymint/BlockMode.h>
namespace keymint { #include <android/hardware/security/keymint/Digest.h>
#include <android/hardware/security/keymint/KeyParameter.h>
#include <android/hardware/security/keymint/KeyPurpose.h>
#include <android/hardware/security/keymint/TagType.h>
namespace android::hardware::security::keymint {
void AuthorizationSet::Sort() { void AuthorizationSet::Sort() {
std::sort(data_.begin(), data_.end()); std::sort(data_.begin(), data_.end());
@ -220,10 +218,11 @@ struct choose_serializer<> {
}; };
template <TagType tag_type, Tag tag, typename... Tail> template <TagType tag_type, Tag tag, typename... Tail>
struct choose_serializer<android::hardware::keymint::TypedTag<tag_type, tag>, Tail...> { struct choose_serializer<android::hardware::security::keymint::TypedTag<tag_type, tag>, Tail...> {
static OutStreams& serialize(OutStreams& out, const KeyParameter& param) { static OutStreams& serialize(OutStreams& out, const KeyParameter& param) {
if (param.tag == tag) { if (param.tag == tag) {
return android::hardware::keymint::serialize(TypedTag<tag_type, tag>(), out, param); return android::hardware::security::keymint::serialize(TypedTag<tag_type, tag>(), out,
param);
} else { } else {
return choose_serializer<Tail...>::serialize(out, param); return choose_serializer<Tail...>::serialize(out, param);
} }
@ -329,7 +328,8 @@ template <TagType tag_type, Tag tag, typename... Tail>
struct choose_deserializer<TypedTag<tag_type, tag>, Tail...> { struct choose_deserializer<TypedTag<tag_type, tag>, Tail...> {
static InStreams& deserialize(InStreams& in, KeyParameter* param) { static InStreams& deserialize(InStreams& in, KeyParameter* param) {
if (param->tag == tag) { if (param->tag == tag) {
return android::hardware::keymint::deserialize(TypedTag<tag_type, tag>(), in, param); return android::hardware::security::keymint::deserialize(TypedTag<tag_type, tag>(), in,
param);
} else { } else {
return choose_deserializer<Tail...>::deserialize(in, param); return choose_deserializer<Tail...>::deserialize(in, param);
} }
@ -501,15 +501,14 @@ AuthorizationSetBuilder& AuthorizationSetBuilder::GcmModeMacLen(uint32_t macLeng
} }
AuthorizationSetBuilder& AuthorizationSetBuilder::BlockMode( AuthorizationSetBuilder& AuthorizationSetBuilder::BlockMode(
std::initializer_list<android::hardware::keymint::BlockMode> blockModes) { std::initializer_list<android::hardware::security::keymint::BlockMode> blockModes) {
for (auto mode : blockModes) { for (auto mode : blockModes) {
push_back(TAG_BLOCK_MODE, mode); push_back(TAG_BLOCK_MODE, mode);
} }
return *this; return *this;
} }
AuthorizationSetBuilder& AuthorizationSetBuilder::Digest( AuthorizationSetBuilder& AuthorizationSetBuilder::Digest(std::vector<keymint::Digest> digests) {
std::vector<android::hardware::keymint::Digest> digests) {
for (auto digest : digests) { for (auto digest : digests) {
push_back(TAG_DIGEST, digest); push_back(TAG_DIGEST, digest);
} }
@ -524,6 +523,4 @@ AuthorizationSetBuilder& AuthorizationSetBuilder::Padding(
return *this; return *this;
} }
} // namespace keymint } // namespace android::hardware::security::keymint
} // namespace hardware
} // namespace android

22
keymint/support/include/keymintSupport/attestation_record.h → security/keymint/support/include/keymint_support/attestation_record.h
View file

@ -16,20 +16,14 @@
#pragma once #pragma once
#include <android/hardware/keymint/ErrorCode.h> #include <android/hardware/security/keymint/ErrorCode.h>
#include <android/hardware/keymint/IKeyMintDevice.h> #include <android/hardware/security/keymint/IKeyMintDevice.h>
#include <keymintSupport/attestation_record.h> #include <keymint_support/attestation_record.h>
#include <keymintSupport/authorization_set.h> #include <keymint_support/authorization_set.h>
#include <keymintSupport/openssl_utils.h> #include <keymint_support/openssl_utils.h>
namespace android { namespace android::hardware::security::keymint {
namespace hardware {
namespace keymint {
using android::hardware::keymint::KeyParameter;
using android::hardware::keymint::Tag;
using android::hardware::keymint::TAG_ALGORITHM;
class AuthorizationSet; class AuthorizationSet;
@ -90,6 +84,4 @@ ErrorCode parse_root_of_trust(const uint8_t* asn1_key_desc, size_t asn1_key_desc
keymint_verified_boot_t* verified_boot_state, bool* device_locked, keymint_verified_boot_t* verified_boot_state, bool* device_locked,
std::vector<uint8_t>* verified_boot_hash); std::vector<uint8_t>* verified_boot_hash);
} // namespace keymint } // namespace android::hardware::security::keymint
} // namespace hardware
} // namespace android

23
keymint/support/include/keymintSupport/authorization_set.h → security/keymint/support/include/keymint_support/authorization_set.h
View file

@ -19,21 +19,14 @@
#include <vector> #include <vector>
#include <android/hardware/keymint/BlockMode.h> #include <android/hardware/security/keymint/BlockMode.h>
#include <android/hardware/keymint/Digest.h> #include <android/hardware/security/keymint/Digest.h>
#include <android/hardware/keymint/EcCurve.h> #include <android/hardware/security/keymint/EcCurve.h>
#include <android/hardware/keymint/PaddingMode.h> #include <android/hardware/security/keymint/PaddingMode.h>
#include <keymintSupport/keymint_tags.h> #include <keymint_support/keymint_tags.h>
namespace android { namespace android::hardware::security::keymint {
namespace hardware {
namespace keymint {
using android::hardware::keymint::BlockMode;
using android::hardware::keymint::Digest;
using android::hardware::keymint::EcCurve;
using android::hardware::keymint::PaddingMode;
using std::vector; using std::vector;
@ -322,8 +315,6 @@ class AuthorizationSetBuilder : public AuthorizationSet {
} }
}; };
} // namespace keymint } // namespace android::hardware::security::keymint
} // namespace hardware
} // namespace android
#endif // SYSTEM_SECURITY_KEYSTORE_KM4_AUTHORIZATION_SET_H_ #endif // SYSTEM_SECURITY_KEYSTORE_KM4_AUTHORIZATION_SET_H_

42
keymint/support/include/keymintSupport/key_param_output.h → security/keymint/support/include/keymint_support/key_param_output.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2017 The Android Open Source Project * Copyright (C) 2020 The Android Open Source Project
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -20,28 +20,24 @@
#include <iostream> #include <iostream>
#include <vector> #include <vector>
#include <android/hardware/security/keymint/Algorithm.h>
#include <android/hardware/security/keymint/BlockMode.h>
#include <android/hardware/security/keymint/Digest.h>
#include <android/hardware/security/keymint/EcCurve.h>
#include <android/hardware/security/keymint/ErrorCode.h>
#include <android/hardware/security/keymint/HardwareAuthenticatorType.h>
#include <android/hardware/security/keymint/KeyCharacteristics.h>
#include <android/hardware/security/keymint/KeyOrigin.h>
#include <android/hardware/security/keymint/KeyParameter.h>
#include <android/hardware/security/keymint/KeyPurpose.h>
#include <android/hardware/security/keymint/PaddingMode.h>
#include <android/hardware/security/keymint/SecurityLevel.h>
#include <android/hardware/security/keymint/Tag.h>
#include <android/hardware/security/keymint/TagType.h>
#include "keymint_tags.h" #include "keymint_tags.h"
#include <android/hardware/keymint/Algorithm.h> namespace android::hardware::security::keymint {
#include <android/hardware/keymint/BlockMode.h>
#include <android/hardware/keymint/Digest.h>
#include <android/hardware/keymint/EcCurve.h>
#include <android/hardware/keymint/ErrorCode.h>
#include <android/hardware/keymint/HardwareAuthenticatorType.h>
#include <android/hardware/keymint/KeyCharacteristics.h>
#include <android/hardware/keymint/KeyOrigin.h>
#include <android/hardware/keymint/KeyParameter.h>
#include <android/hardware/keymint/KeyPurpose.h>
#include <android/hardware/keymint/PaddingMode.h>
#include <android/hardware/keymint/SecurityLevel.h>
#include <android/hardware/keymint/Tag.h>
#include <android/hardware/keymint/TagType.h>
namespace android {
namespace hardware {
namespace keymint {
using namespace ::android::hardware::keymint;
inline ::std::ostream& operator<<(::std::ostream& os, Algorithm value) { inline ::std::ostream& operator<<(::std::ostream& os, Algorithm value) {
return os << toString(value); return os << toString(value);
@ -101,8 +97,6 @@ inline ::std::ostream& operator<<(::std::ostream& os, Tag tag) {
return os << toString(tag); return os << toString(tag);
} }
} // namespace keymint } // namespace android::hardware::security::keymint
} // namespace hardware
} // namespace android
#endif // HARDWARE_INTERFACES_KEYMINT_SUPPORT_INCLUDE_KEY_PARAM_OUTPUT_H_ #endif // HARDWARE_INTERFACES_KEYMINT_SUPPORT_INCLUDE_KEY_PARAM_OUTPUT_H_

104
keymint/support/include/keymintSupport/keymint_tags.h → security/keymint/support/include/keymint_support/keymint_tags.h
View file

@ -17,24 +17,20 @@
#ifndef HARDWARE_INTERFACES_KEYMINT_SUPPORT_INCLUDE_KEYMINT_TAGS_H_ #ifndef HARDWARE_INTERFACES_KEYMINT_SUPPORT_INCLUDE_KEYMINT_TAGS_H_
#define HARDWARE_INTERFACES_KEYMINT_SUPPORT_INCLUDE_KEYMINT_TAGS_H_ #define HARDWARE_INTERFACES_KEYMINT_SUPPORT_INCLUDE_KEYMINT_TAGS_H_
#include <android/hardware/keymint/Algorithm.h> #include <android/hardware/security/keymint/Algorithm.h>
#include <android/hardware/keymint/BlockMode.h> #include <android/hardware/security/keymint/BlockMode.h>
#include <android/hardware/keymint/Digest.h> #include <android/hardware/security/keymint/Digest.h>
#include <android/hardware/keymint/EcCurve.h> #include <android/hardware/security/keymint/EcCurve.h>
#include <android/hardware/keymint/HardwareAuthenticatorType.h> #include <android/hardware/security/keymint/HardwareAuthenticatorType.h>
#include <android/hardware/keymint/KeyOrigin.h> #include <android/hardware/security/keymint/KeyOrigin.h>
#include <android/hardware/keymint/KeyParameter.h> #include <android/hardware/security/keymint/KeyParameter.h>
#include <android/hardware/keymint/KeyPurpose.h> #include <android/hardware/security/keymint/KeyPurpose.h>
#include <android/hardware/keymint/PaddingMode.h> #include <android/hardware/security/keymint/PaddingMode.h>
#include <android/hardware/keymint/SecurityLevel.h> #include <android/hardware/security/keymint/SecurityLevel.h>
#include <android/hardware/keymint/Tag.h> #include <android/hardware/security/keymint/Tag.h>
#include <android/hardware/keymint/TagType.h> #include <android/hardware/security/keymint/TagType.h>
namespace android::hardware::keymint { namespace android::hardware::security::keymint {
using android::hardware::keymint::KeyParameter;
using android::hardware::keymint::Tag;
using android::hardware::keymint::TagType;
// The following create the numeric values that KM_TAG_PADDING and KM_TAG_DIGEST used to have. We // The following create the numeric values that KM_TAG_PADDING and KM_TAG_DIGEST used to have. We
// need these old values to be able to support old keys that use them. // need these old values to be able to support old keys that use them.
@ -337,78 +333,6 @@ inline NullOr<const typename TypedTag2ValueType<TypedTag<tag_type, tag>>::type&>
return accessTagValue(ttag, param); return accessTagValue(ttag, param);
} }
} // namespace android::hardware::keymint } // namespace android::hardware::security::keymint
namespace std {
using namespace android::hardware::keymint;
// Aidl generates KeyParameter operator<, >, ==, != for cpp translation but not ndk
// translations. So we cannot straight forward overload these operators.
// However we need our custom comparison for KeyParameters. So we will
// overload std::less, equal_to instead.
template <>
struct std::less<KeyParameter> {
bool operator()(const KeyParameter& a, const KeyParameter& b) const {
if (a.tag != b.tag) return a.tag < b.tag;
int retval;
switch (typeFromTag(a.tag)) {
case TagType::INVALID:
case TagType::BOOL:
return false;
case TagType::ENUM:
case TagType::ENUM_REP:
case TagType::UINT:
case TagType::UINT_REP:
return a.integer < b.integer;
case TagType::ULONG:
case TagType::ULONG_REP:
case TagType::DATE:
return a.longInteger < b.longInteger;
case TagType::BIGNUM:
case TagType::BYTES:
// Handle the empty cases.
if (a.blob.size() == 0) return b.blob.size() != 0;
if (b.blob.size() == 0) return false;
retval = memcmp(&a.blob[0], &b.blob[0], std::min(a.blob.size(), b.blob.size()));
// if one is the prefix of the other the longer wins
if (retval == 0) return a.blob.size() < b.blob.size();
// Otherwise a is less if a is less.
else
return retval < 0;
}
return false;
}
};
template <>
struct std::equal_to<KeyParameter> {
bool operator()(const KeyParameter& a, const KeyParameter& b) const {
if (a.tag != b.tag) {
return false;
}
switch (typeFromTag(a.tag)) {
case TagType::INVALID:
case TagType::BOOL:
return true;
case TagType::ENUM:
case TagType::ENUM_REP:
case TagType::UINT:
case TagType::UINT_REP:
return a.integer == b.integer;
case TagType::ULONG:
case TagType::ULONG_REP:
case TagType::DATE:
return a.longInteger == b.longInteger;
case TagType::BIGNUM:
case TagType::BYTES:
if (a.blob.size() != b.blob.size()) return false;
return a.blob.size() == 0 || memcmp(&a.blob[0], &b.blob[0], a.blob.size()) == 0;
}
return false;
}
};
} // namespace std
#endif // HARDWARE_INTERFACES_KEYMINT_SUPPORT_INCLUDE_KEYMINT_TAGS_H_ #endif // HARDWARE_INTERFACES_KEYMINT_SUPPORT_INCLUDE_KEYMINT_TAGS_H_

10
keymint/support/include/keymintSupport/keymint_utils.h → security/keymint/support/include/keymint_support/keymint_utils.h
View file

@ -19,11 +19,9 @@
#ifndef HARDWARE_INTERFACES_KEYMINT_10_SUPPORT_KEYMINT_UTILS_H_ #ifndef HARDWARE_INTERFACES_KEYMINT_10_SUPPORT_KEYMINT_UTILS_H_
#define HARDWARE_INTERFACES_KEYMINT_10_SUPPORT_KEYMINT_UTILS_H_ #define HARDWARE_INTERFACES_KEYMINT_10_SUPPORT_KEYMINT_UTILS_H_
#include <android/hardware/keymint/HardwareAuthToken.h> #include <android/hardware/security/keymint/HardwareAuthToken.h>
namespace android { namespace android::hardware::security::keymint {
namespace hardware {
namespace keymint {
using std::vector; using std::vector;
@ -44,8 +42,6 @@ vector<uint8_t> authToken2vector(const HardwareAuthToken& token);
uint32_t getOsVersion(); uint32_t getOsVersion();
uint32_t getOsPatchlevel(); uint32_t getOsPatchlevel();
} // namespace keymint } // namespace android::hardware::security::keymint
} // namespace hardware
} // namespace android
#endif // HARDWARE_INTERFACES_KEYMINT_10_SUPPORT_KEYMINT_UTILS_H_ #endif // HARDWARE_INTERFACES_KEYMINT_10_SUPPORT_KEYMINT_UTILS_H_

22
keymint/support/include/keymintSupport/openssl_utils.h → security/keymint/support/include/keymint_support/openssl_utils.h
View file

@ -17,11 +17,13 @@
#ifndef HARDWARE_INTERFACES_KEYMINT_1_0_SUPPORT_OPENSSL_UTILS_H_ #ifndef HARDWARE_INTERFACES_KEYMINT_1_0_SUPPORT_OPENSSL_UTILS_H_
#define HARDWARE_INTERFACES_KEYMINT_1_0_SUPPORT_OPENSSL_UTILS_H_ #define HARDWARE_INTERFACES_KEYMINT_1_0_SUPPORT_OPENSSL_UTILS_H_
#include <android/hardware/keymint/Digest.h> #include <android/hardware/security/keymint/Digest.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/x509.h> #include <openssl/x509.h>
namespace android::hardware::security::keymint {
template <typename T, void (*F)(T*)> template <typename T, void (*F)(T*)>
struct UniquePtrDeleter { struct UniquePtrDeleter {
void operator()(T* p) const { F(p); } void operator()(T* p) const { F(p); }
@ -40,24 +42,26 @@ MAKE_OPENSSL_PTR_TYPE(BN_CTX)
typedef std::unique_ptr<BIGNUM, UniquePtrDeleter<BIGNUM, BN_free>> BIGNUM_Ptr; typedef std::unique_ptr<BIGNUM, UniquePtrDeleter<BIGNUM, BN_free>> BIGNUM_Ptr;
inline const EVP_MD* openssl_digest(android::hardware::keymint::Digest digest) { inline const EVP_MD* openssl_digest(Digest digest) {
switch (digest) { switch (digest) {
case android::hardware::keymint::Digest::NONE: case Digest::NONE:
return nullptr; return nullptr;
case android::hardware::keymint::Digest::MD5: case Digest::MD5:
return EVP_md5(); return EVP_md5();
case android::hardware::keymint::Digest::SHA1: case Digest::SHA1:
return EVP_sha1(); return EVP_sha1();
case android::hardware::keymint::Digest::SHA_2_224: case Digest::SHA_2_224:
return EVP_sha224(); return EVP_sha224();
case android::hardware::keymint::Digest::SHA_2_256: case Digest::SHA_2_256:
return EVP_sha256(); return EVP_sha256();
case android::hardware::keymint::Digest::SHA_2_384: case Digest::SHA_2_384:
return EVP_sha384(); return EVP_sha384();
case android::hardware::keymint::Digest::SHA_2_512: case Digest::SHA_2_512:
return EVP_sha512(); return EVP_sha512();
} }
return nullptr; return nullptr;
} }
} // namespace android::hardware::security::keymint
#endif // HARDWARE_INTERFACES_KEYMINT_1_0_SUPPORT_OPENSSL_UTILS_H_ #endif // HARDWARE_INTERFACES_KEYMINT_1_0_SUPPORT_OPENSSL_UTILS_H_

14
keymint/support/key_param_output.cpp → security/keymint/support/key_param_output.cpp
View file

@ -14,15 +14,13 @@
* limitations under the License. * limitations under the License.
*/ */
#include <keymintSupport/key_param_output.h> #include <keymint_support/key_param_output.h>
#include <keymintSupport/keymint_tags.h>
#include <iomanip> #include <iomanip>
namespace android { #include <keymint_support/keymint_tags.h>
namespace hardware {
namespace keymint { namespace android::hardware::security::keymint {
using ::std::endl; using ::std::endl;
using ::std::ostream; using ::std::ostream;
@ -71,6 +69,4 @@ ostream& operator<<(ostream& os, const KeyParameter& param) {
return os << "UNKNOWN TAG TYPE!"; return os << "UNKNOWN TAG TYPE!";
} }
} // namespace keymint } // namespace android::hardware::security::keymint
} // namespace hardware
} // namespace android

6
keymint/support/keymint_utils.cpp → security/keymint/support/keymint_utils.cpp
View file

@ -18,11 +18,11 @@
#include <android-base/properties.h> #include <android-base/properties.h>
#include <hardware/hw_auth_token.h> #include <hardware/hw_auth_token.h>
#include <keymintSupport/keymint_utils.h> #include <keymint_support/keymint_utils.h>
#include <arpa/inet.h> #include <arpa/inet.h>
namespace android::hardware::keymint { namespace android::hardware::security::keymint {
namespace { namespace {
@ -111,4 +111,4 @@ uint32_t getOsPatchlevel() {
return getOsPatchlevel(patchlevel.c_str()); return getOsPatchlevel(patchlevel.c_str());
} }
} // namespace android::hardware::keymint } // namespace android::hardware::security::keymint