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

Commit 4d2be4b6 authored by Eran Messeri's avatar Eran Messeri Committed by Automerger Merge Worker
Browse files

Merge "Remove KeyMint TODOs" am: 45e16a09 

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

Change-Id: I61076f50f8aa7c58000c424b78f54d6d74686f92
parents cd489e35 45e16a09

security/keymint/aidl/android/hardware/security/keymint/IKeyMintDevice.aidl

+0 −2
Original line number Diff line number Diff line
@@ -233,8 +233,6 @@ interface IKeyMintDevice { 
     * indistinguishable from random.  Thus, if the entropy from any source is good, the output

     * must be good.

     *

     * TODO(seleneh) specify what mixing functions and cprng we allow.

     *

     * @param data Bytes to be mixed into the CRNG seed.  The caller must not provide more than 2

     *        KiB of data per invocation.

     *

security/keymint/aidl/android/hardware/security/keymint/KeyMintHardwareInfo.aidl

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ parcelable KeyMintHardwareInfo { 
     * Implementation version of the keymint hardware.  The version number is implementation

     * defined, and not necessarily globally meaningful.  The version is used to distinguish

     * between different versions of a given implementation.

     * TODO(seleneh) add the version related info to the code.

     */

    int versionNumber;

security/keymint/aidl/android/hardware/security/keymint/PaddingMode.aidl

+0 −2
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
package android.hardware.security.keymint;



/**

 * TODO(seleneh) update the description.

 *

 * Padding modes that may be applied to plaintext for encryption operations.  This list includes

 * padding modes for both symmetric and asymmetric algorithms.  Note that implementations should not

 * provide all possible combinations of algorithm and padding, only the

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

+3 −4
Original line number Diff line number Diff line
@@ -268,10 +268,6 @@ enum Tag { 
    USAGE_EXPIRE_DATETIME = TagType.DATE | 402,



    /**

     * TODO(seleneh) this tag need to be deleted.

     *

     * TODO(seleneh) this tag need to be deleted.

     *

     * Tag::MIN_SECONDS_BETWEEN_OPS specifies the minimum amount of time that elapses between

     * allowed operations using a key.  This can be used to rate-limit uses of keys in contexts

     * where unlimited use may enable brute force attacks.
@@ -289,6 +285,8 @@ enum Tag { 
     * fails because the table is full, KeyMint returns ErrorCode::TOO_MANY_OPERATIONS.

     *

     * Must be hardware-enforced.

     *

     * TODO(b/191458710): find out if this tag is still supported.

     */

    MIN_SECONDS_BETWEEN_OPS = TagType.UINT | 403,
@@ -876,6 +874,7 @@ enum Tag { 
    STORAGE_KEY = TagType.BOOL | 722,



    /**

     * OBSOLETE: Do not use. See IKeyMintOperation.updateAad instead.

     * TODO: Delete when keystore1 is deleted.

     */

    ASSOCIATED_DATA = TagType.BYTES | 1000,