Fix formatting of identity credential aidl am: 3b9abd3b9a

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

Change-Id: Ib7ca8663a5753ad721b440e6a28433a42c8d3aed
This commit is contained in:
Seth Moore 2022-01-25 20:53:30 +00:00 committed by Automerger Merge Worker
commit 6cc928b4f2
2 changed files with 14 additions and 15 deletions

View file

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

View file

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