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

Commit 78063761 authored by Seth Moore's avatar Seth Moore
Browse files

Revert "Fix formatting of identity credential aidl" 

Revert "Add dependency on keymint cpp lib"

Revert "Allow default identity service to call keymint"

Revert submission 1956689-add rkp to identity-default

Reason for revert: Broke git-master. Will resubmit later.
Reverted Changes:
I96dcf3027:Add remote key provisioning to the IC HAL
Id686ac33a:Add dependency on keymint cpp lib
Ib368a2a00:Log to logd in the default identity service
I7d2906de0:Refactor IC support for RKP
Iae0f14f1c:Fix formatting of identity credential aidl
I01d086a4b:Allow default identity service to call keymint

Change-Id: I36a012ca72d7b214bde813fd3a1c08a99101f607
parent 5502a1fa

identity/aidl/android/hardware/identity/IIdentityCredentialStore.aidl

+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.

identity/aidl/android/hardware/identity/IWritableIdentityCredential.aidl

+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);



}