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

Merge changes from topic "revert-1956689-add rkp to identity-default-ENFHZTRTBV" am: 6278c2d241 am: 11b8593a99

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

Change-Id: Ic96e15568bb68937428c5c31f94c3a5111366d36
This commit is contained in:
Seth Moore 2022-01-25 23:27:42 +00:00 committed by Automerger Merge Worker
commit 4f781be698
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
identity/aidl/android/hardware/identity/IIdentityCredentialStore.aidl
View file

@ -215,16 +215,16 @@ interface IIdentityCredentialStore {
* @return an IWritableIdentityCredential interface that provides operations to
* provision a credential.
*/
IWritableIdentityCredential createCredential(
in @utf8InCpp String docType, in boolean testCredential);
IWritableIdentityCredential createCredential(in @utf8InCpp String docType,
in boolean testCredential);
/**
* getCredential retrieves an IIdentityCredential interface which allows use of a stored
* Credential.
*
* The cipher suite used to communicate with the remote verifier must also be specified.
* Currently only a single cipher-suite is supported. Support for other cipher suites may be
* added in a future version of this HAL.
* The cipher suite used to communicate with the remote verifier must also be specified. Currently
* only a single cipher-suite is supported. Support for other cipher suites may be added in a
* future version of this HAL.
*
* This method fails with STATUS_INVALID_DATA if the passed in credentialData cannot be
* decoded or decrypted.

19
identity/aidl/android/hardware/identity/IWritableIdentityCredential.aidl
View file

@ -131,8 +131,7 @@ interface IWritableIdentityCredential {
*
* @return the X.509 certificate chain for the credentialKey
*/
Certificate[] getAttestationCertificate(
in byte[] attestationApplicationId, in byte[] attestationChallenge);
Certificate[] getAttestationCertificate(in byte[] attestationApplicationId, in byte[] attestationChallenge);
/**
* Start the personalization process.
@ -184,11 +183,11 @@ interface IWritableIdentityCredential {
* in the secure environment. If this requirement is not met the call fails with
* STATUS_INVALID_DATA.
*
* @return a structure with the passed-in data and MAC created with storageKey for
* authenticating the data at a later point in time.
* @return a structure with the passed-in data and MAC created with storageKey for authenticating
* the data at a later point in time.
*/
SecureAccessControlProfile addAccessControlProfile(in int id, in Certificate readerCertificate,
in boolean userAuthenticationRequired, in long timeoutMillis, in long secureUserId);
in boolean userAuthenticationRequired, in long timeoutMillis, in long secureUserId);
/**
* Begins the process of adding an entry to the credential. All access control profiles must be
@ -210,7 +209,7 @@ interface IWritableIdentityCredential {
* is not met this method fails with STATUS_INVALID_DATA.
*/
void beginAddEntry(in int[] accessControlProfileIds, in @utf8InCpp String nameSpace,
in @utf8InCpp String name, in int entrySize);
in @utf8InCpp String name, in int entrySize);
/**
* Continues the process of adding an entry, providing a value or part of a value.
@ -222,8 +221,8 @@ interface IWritableIdentityCredential {
* chunk sizes must equal the value of the beginAddEntry() entrySize argument. If this
* requirement is not met the call fails with STATUS_INVALID_DATA.
*
* @param content is the entry value, encoded as CBOR. In the case the content exceeds
* gcmChunkSize, this may be partial content up to gcmChunkSize bytes long.
* @param content is the entry value, encoded as CBOR. In the case the content exceeds gcmChunkSize,
* this may be partial content up to gcmChunkSize bytes long.
*
* @return the encrypted and MACed content. For directly-available credentials the contents are
* implementation-defined. For other credentials, the result contains
@ -322,7 +321,8 @@ interface IWritableIdentityCredential {
* }
*/
@SuppressWarnings(value={"out-array"})
void finishAddingEntries(out byte[] credentialData, out byte[] proofOfProvisioningSignature);
void finishAddingEntries(out byte[] credentialData,
out byte[] proofOfProvisioningSignature);
/**
* Sets the expected size of the ProofOfProvisioning returned by finishAddingEntries(). This
@ -335,4 +335,5 @@ interface IWritableIdentityCredential {
* @param expectedProofOfProvisioningSize the expected size of ProofOfProvisioning.
*/
void setExpectedProofOfProvisioningSize(in int expectedProofOfProvisioningSize);
}