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

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

Merge cherrypicks of [3535875, 3534641, 3534642, 3536651, 3536652, 3536653,... 

Merge cherrypicks of [3535875, 3534641, 3534642, 3536651, 3536652, 3536653, 3535904, 3535498, 3536654, 3535876, 3534643, 3535905] into pi-release

Change-Id: I66e09dc92dface347f577283255440a34bdd842d
parents caea6858 ba9853b1

keymaster/4.0/support/include/keymasterV4_0/keymaster_tags.h

+11 −17
Original line number Diff line number Diff line
@@ -142,27 +142,23 @@ DECLARE_TYPED_TAG(ROOT_OF_TRUST); 
DECLARE_TYPED_TAG(RSA_PUBLIC_EXPONENT);

DECLARE_TYPED_TAG(TRUSTED_CONFIRMATION_REQUIRED);

DECLARE_TYPED_TAG(UNIQUE_ID);

DECLARE_TYPED_TAG(UNLOCKED_DEVICE_REQUIRED);

DECLARE_TYPED_TAG(USAGE_EXPIRE_DATETIME);

DECLARE_TYPED_TAG(USER_AUTH_TYPE);

DECLARE_TYPED_TAG(USER_ID);

DECLARE_TYPED_TAG(USER_SECURE_ID);



template <typename... Elems>

struct MetaList {};



using all_tags_t =

    MetaList<TAG_INVALID_t, TAG_KEY_SIZE_t, TAG_MAC_LENGTH_t, TAG_CALLER_NONCE_t,

             TAG_MIN_MAC_LENGTH_t, TAG_RSA_PUBLIC_EXPONENT_t, TAG_INCLUDE_UNIQUE_ID_t,

             TAG_ACTIVE_DATETIME_t, TAG_ORIGINATION_EXPIRE_DATETIME_t, TAG_USAGE_EXPIRE_DATETIME_t,

             TAG_MIN_SECONDS_BETWEEN_OPS_t, TAG_MAX_USES_PER_BOOT_t, TAG_USER_ID_t,

             TAG_USER_SECURE_ID_t, TAG_NO_AUTH_REQUIRED_t, TAG_AUTH_TIMEOUT_t,

             TAG_ALLOW_WHILE_ON_BODY_t, TAG_UNLOCKED_DEVICE_REQUIRED_t, TAG_APPLICATION_ID_t,

             TAG_APPLICATION_DATA_t, TAG_CREATION_DATETIME_t, TAG_ROLLBACK_RESISTANCE_t,

             TAG_ROOT_OF_TRUST_t, TAG_ASSOCIATED_DATA_t, TAG_NONCE_t, TAG_BOOTLOADER_ONLY_t,

             TAG_OS_VERSION_t, TAG_OS_PATCHLEVEL_t, TAG_UNIQUE_ID_t, TAG_ATTESTATION_CHALLENGE_t,

             TAG_ATTESTATION_APPLICATION_ID_t, TAG_RESET_SINCE_ID_ROTATION_t, TAG_PURPOSE_t,

             TAG_ALGORITHM_t, TAG_BLOCK_MODE_t, TAG_DIGEST_t, TAG_PADDING_t,

using all_tags_t = MetaList<

    TAG_INVALID_t, TAG_KEY_SIZE_t, TAG_MAC_LENGTH_t, TAG_CALLER_NONCE_t, TAG_MIN_MAC_LENGTH_t,

    TAG_RSA_PUBLIC_EXPONENT_t, TAG_INCLUDE_UNIQUE_ID_t, TAG_ACTIVE_DATETIME_t,

    TAG_ORIGINATION_EXPIRE_DATETIME_t, TAG_USAGE_EXPIRE_DATETIME_t, TAG_MIN_SECONDS_BETWEEN_OPS_t,

    TAG_MAX_USES_PER_BOOT_t, TAG_USER_SECURE_ID_t, TAG_NO_AUTH_REQUIRED_t, TAG_AUTH_TIMEOUT_t,

    TAG_ALLOW_WHILE_ON_BODY_t, TAG_APPLICATION_ID_t, TAG_APPLICATION_DATA_t,

    TAG_CREATION_DATETIME_t, TAG_ROLLBACK_RESISTANCE_t, TAG_ROOT_OF_TRUST_t, TAG_ASSOCIATED_DATA_t,

    TAG_NONCE_t, TAG_BOOTLOADER_ONLY_t, TAG_OS_VERSION_t, TAG_OS_PATCHLEVEL_t, TAG_UNIQUE_ID_t,

    TAG_ATTESTATION_CHALLENGE_t, TAG_ATTESTATION_APPLICATION_ID_t, TAG_RESET_SINCE_ID_ROTATION_t,

    TAG_PURPOSE_t, TAG_ALGORITHM_t, TAG_BLOCK_MODE_t, TAG_DIGEST_t, TAG_PADDING_t,

    TAG_BLOB_USAGE_REQUIREMENTS_t, TAG_ORIGIN_t, TAG_USER_AUTH_TYPE_t, TAG_EC_CURVE_t>;



template <typename TypedTagType>
@@ -347,7 +343,6 @@ inline bool operator==(const KeyParameter& a, const KeyParameter& b) { 
        case Tag::BOOTLOADER_ONLY:

        case Tag::NO_AUTH_REQUIRED:

        case Tag::ALLOW_WHILE_ON_BODY:

        case Tag::UNLOCKED_DEVICE_REQUIRED:

        case Tag::ROLLBACK_RESISTANCE:

        case Tag::RESET_SINCE_ID_ROTATION:

        case Tag::TRUSTED_CONFIRMATION_REQUIRED:
@@ -362,7 +357,6 @@ inline bool operator==(const KeyParameter& a, const KeyParameter& b) { 
        case Tag::OS_VERSION:

        case Tag::OS_PATCHLEVEL:

        case Tag::MAC_LENGTH:

        case Tag::USER_ID:

        case Tag::AUTH_TIMEOUT:

        case Tag::VENDOR_PATCHLEVEL:

        case Tag::BOOT_PATCHLEVEL:

keymaster/4.0/types.hal

+1 −6
Original line number Diff line number Diff line
@@ -118,8 +118,7 @@ enum Tag : uint32_t { 
                                                       * boot. */



    /* User authentication */

    // 500 reserved

    USER_ID = TagType:UINT | 501,             /* Android ID of authorized user or authenticator(s), */

    // 500-501 reserved

    USER_SECURE_ID = TagType:ULONG_REP | 502, /* Secure ID of authorized user or authenticator(s).

                                               * Disallowed if NO_AUTH_REQUIRED is present. */

    NO_AUTH_REQUIRED = TagType:BOOL | 503,    /* If key is usable without authentication. */
@@ -192,9 +191,6 @@ enum Tag : uint32_t { 
     * match the data described in the token, keymaster must return NO_USER_CONFIRMATION. */

    TRUSTED_CONFIRMATION_REQUIRED = TagType:BOOL | 508,



    UNLOCKED_DEVICE_REQUIRED = TagType:BOOL | 509, /* Require the device screen to be unlocked if

                                                    * the key is used. */



    /* Application access control */

    APPLICATION_ID = TagType:BYTES | 601, /* Byte string identifying the authorized application. */
@@ -475,7 +471,6 @@ enum ErrorCode : int32_t { 
    PROOF_OF_PRESENCE_REQUIRED = -69,

    CONCURRENT_PROOF_OF_PRESENCE_REQUESTED = -70,

    NO_USER_CONFIRMATION = -71,

    DEVICE_LOCKED = -72,



    UNIMPLEMENTED = -100,

    VERSION_MISMATCH = -101,