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

Commit 57bff6ce authored by David Drysdale's avatar David Drysdale Committed by Automerger Merge Worker
Browse files

Merge "Updated the description for APPLICATION_ID and APPLICATION_DATA" am:... 

Merge "Updated the description for APPLICATION_ID and APPLICATION_DATA" am: 6cd7c629 am: de591340 am: b6e1609d am: 5fcaa8f9

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



Change-Id: I5f0ca24fb4b77fa6f75ca3eba5e8f57d9f100882
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 871b0f46 5fcaa8f9

security/keymint/aidl/android/hardware/security/keymint/Tag.aidl

+6 −2
Original line number Diff line number Diff line
@@ -504,7 +504,9 @@ enum Tag { 
     * that is necessary during all uses of the key.  In particular, calls to exportKey() and

     * getKeyCharacteristics() must provide the same value to the clientId parameter, and calls to

     * begin() must provide this tag and the same associated data as part of the inParams set.  If

     * the correct data is not provided, the method must return ErrorCode::INVALID_KEY_BLOB.

     * the correct data is not provided, the method must return ErrorCode::INVALID_KEY_BLOB.  Note

     * that a key with a zero-length APPLICATION_ID cannot have its key characteristics retrieved

     * using getKeyCharacteristics() due to a historical limitation of the API.

     *

     * The content of this tag must be bound to the key cryptographically, meaning it must not be

     * possible for an adversary who has access to all of the secure world secrets but does not have
@@ -525,7 +527,9 @@ enum Tag { 
     * that is necessary during all uses of the key.  In particular, calls to begin() and

     * exportKey() must provide the same value to the appData parameter, and calls to begin must

     * provide this tag and the same associated data as part of the inParams set.  If the correct

     * data is not provided, the method must return ErrorCode::INVALID_KEY_BLOB.

     * data is not provided, the method must return ErrorCode::INVALID_KEY_BLOB.  Note that a key

     * with a zero-length APPLICATION_DATA cannot have its key characteristics retrieved using

     * getKeyCharacteristics() due to a historical limitation of the API.

     *

     * The content of this tag must be bound to the key cryptographically, meaning it must not be

     * possible for an adversary who has access to all of the secure world secrets but does not have