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

Commit 658856e2 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7333400 from e4c611ca to sc-d1-release 

Change-Id: I991b0772c77407da16708b9435c7472422ec6bb5
parents f80050b4 e4c611ca

compatibility_matrices/compatibility_matrix.3.xml

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ 
            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="false">

    <hal format="hidl" optional="true">

        <name>android.hardware.keymaster</name>

        <version>3.0</version>

        <version>4.0</version>

compatibility_matrices/compatibility_matrix.4.xml

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ 
            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="false">

    <hal format="hidl" optional="true">

        <name>android.hardware.keymaster</name>

        <version>3.0</version>

        <version>4.0</version>

compatibility_matrices/compatibility_matrix.5.xml

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ 
            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="false">

    <hal format="hidl" optional="true">

        <name>android.hardware.keymaster</name>

        <version>3.0</version>

        <version>4.0-1</version>

compatibility_matrices/compatibility_matrix.current.xml

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ 
            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="false">

    <hal format="hidl" optional="true">

        <name>android.hardware.keymaster</name>

        <version>3.0</version>

        <version>4.0-1</version>

security/keymint/aidl/android/hardware/security/keymint/AttestationKey.aidl

+12 −0
Original line number Diff line number Diff line
@@ -27,7 +27,19 @@ import android.hardware.security.keymint.KeyParameter; 
@VintfStability

@RustDerive(Clone=true, Eq=true, PartialEq=true, Ord=true, PartialOrd=true, Hash=true)

parcelable AttestationKey {

    /**

     * Key blob containing a key pair with KeyPurpose::ATTEST_KEY

     */

    byte[] keyBlob;



    /**

     * Key parameters needed to use the key in keyBlob, notably Tag::APPLICATION_ID and

     * Tag::APPLICATION_DATA, if they were provided during generation of the key in keyBlob.

     */

    KeyParameter[] attestKeyParams;



    /**

     * The issuerSubjectName to use in the generated attestation.

     */

    byte[] issuerSubjectName;

}