Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f781be6 authored by Seth Moore's avatar Seth Moore Committed by Automerger Merge Worker
Browse files

Merge changes from topic "revert-1956689-add rkp to...

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

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

Change-Id: Ic96e15568bb68937428c5c31f94c3a5111366d36
parents c1ca184d 11b8593a
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -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.
+10 −9
Original line number Diff line number Diff line
@@ -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,8 +183,8 @@ 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);
@@ -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);

}