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

Commit 28e04e62 authored by Karuna Wadhera's avatar Karuna Wadhera Committed by Gerrit Code Review
Browse files

Merge "Add module info AIDL changes and bump the KeyMint version" into main

parents a742007d 866d2752

compatibility_matrices/compatibility_matrix.202504.xml

+1 −1
Original line number Diff line number Diff line
@@ -313,7 +313,7 @@ 
    </hal>

    <hal format="aidl" updatable-via-apex="true">

        <name>android.hardware.security.keymint</name>

        <version>1-3</version>

        <version>1-4</version>

        <interface>

            <name>IKeyMintDevice</name>

            <instance>default</instance>

confirmationui/aidl/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ package { 
aidl_interface {

    name: "android.hardware.confirmationui",

    vendor_available: true,

    imports: [

        "android.hardware.security.keymint-V3",

    defaults: [

        "android.hardware.security.keymint-latest-defaults",

    ],

    srcs: ["android/hardware/confirmationui/*.aidl"],

    stability: "vintf",
@@ -38,7 +38,7 @@ aidl_interface { 
    versions_with_info: [

        {

            version: "1",

            imports: ["android.hardware.security.keymint-V3"],

            imports: ["android.hardware.security.keymint-V4"],

        },

    ],

    frozen: true,

gatekeeper/aidl/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ package { 
aidl_interface {

    name: "android.hardware.gatekeeper",

    vendor_available: true,

    imports: [

        "android.hardware.security.keymint-V3",

    defaults: [

        "android.hardware.security.keymint-latest-defaults",

    ],

    srcs: ["android/hardware/gatekeeper/*.aidl"],

    stability: "vintf",
@@ -32,7 +32,7 @@ aidl_interface { 
    versions_with_info: [

        {

            version: "1",

            imports: ["android.hardware.security.keymint-V3"],

            imports: ["android.hardware.security.keymint-V4"],

        },

    ],

    frozen: true,

security/keymint/aidl/Android.bp

+14 −6
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ aidl_interface { 
        "android.hardware.security.secureclock-V1",

    ],

    stability: "vintf",

    frozen: true,

    frozen: false,

    backend: {

        java: {

            platform_apis: true,
@@ -51,34 +51,42 @@ aidl_interface { 


}



// An aidl_interface_defaults that includes the latest KeyMint AIDL interface.

// aidl_interface modules that depend on KeyMint directly can include this

// aidl_interface_defaults to avoid managing dependency versions explicitly.

aidl_interface_defaults {

    name: "android.hardware.security.keymint-latest-defaults",

    imports: ["android.hardware.security.keymint-V4"],

}



// cc_defaults that includes the latest KeyMint AIDL library.

// Modules that depend on KeyMint directly can include this cc_defaults to avoid

// managing dependency versions explicitly.

cc_defaults {

    name: "keymint_use_latest_hal_aidl_ndk_static",

    static_libs: [

        "android.hardware.security.keymint-V3-ndk",

        "android.hardware.security.keymint-V4-ndk",

    ],

}



cc_defaults {

    name: "keymint_use_latest_hal_aidl_ndk_shared",

    shared_libs: [

        "android.hardware.security.keymint-V3-ndk",

        "android.hardware.security.keymint-V4-ndk",

    ],

}



cc_defaults {

    name: "keymint_use_latest_hal_aidl_cpp_static",

    static_libs: [

        "android.hardware.security.keymint-V3-cpp",

        "android.hardware.security.keymint-V4-cpp",

    ],

}



cc_defaults {

    name: "keymint_use_latest_hal_aidl_cpp_shared",

    shared_libs: [

        "android.hardware.security.keymint-V3-cpp",

        "android.hardware.security.keymint-V4-cpp",

    ],

}
@@ -88,6 +96,6 @@ cc_defaults { 
rust_defaults {

    name: "keymint_use_latest_hal_aidl_rust",

    rustlibs: [

        "android.hardware.security.keymint-V3-rust",

        "android.hardware.security.keymint-V4-rust",

    ],

}

security/keymint/aidl/aidl_api/android.hardware.security.keymint/current/android/hardware/security/keymint/ErrorCode.aidl

+87 −86
Original line number Diff line number Diff line
@@ -36,90 +36,91 @@ package android.hardware.security.keymint; 
@Backing(type="int") @VintfStability

enum ErrorCode {

  OK = 0,

  ROOT_OF_TRUST_ALREADY_SET = -1,

  UNSUPPORTED_PURPOSE = -2,

  INCOMPATIBLE_PURPOSE = -3,

  UNSUPPORTED_ALGORITHM = -4,

  INCOMPATIBLE_ALGORITHM = -5,

  UNSUPPORTED_KEY_SIZE = -6,

  UNSUPPORTED_BLOCK_MODE = -7,

  INCOMPATIBLE_BLOCK_MODE = -8,

  UNSUPPORTED_MAC_LENGTH = -9,

  UNSUPPORTED_PADDING_MODE = -10,

  INCOMPATIBLE_PADDING_MODE = -11,

  UNSUPPORTED_DIGEST = -12,

  INCOMPATIBLE_DIGEST = -13,

  INVALID_EXPIRATION_TIME = -14,

  INVALID_USER_ID = -15,

  INVALID_AUTHORIZATION_TIMEOUT = -16,

  UNSUPPORTED_KEY_FORMAT = -17,

  INCOMPATIBLE_KEY_FORMAT = -18,

  UNSUPPORTED_KEY_ENCRYPTION_ALGORITHM = -19,

  UNSUPPORTED_KEY_VERIFICATION_ALGORITHM = -20,

  INVALID_INPUT_LENGTH = -21,

  KEY_EXPORT_OPTIONS_INVALID = -22,

  DELEGATION_NOT_ALLOWED = -23,

  KEY_NOT_YET_VALID = -24,

  KEY_EXPIRED = -25,

  KEY_USER_NOT_AUTHENTICATED = -26,

  OUTPUT_PARAMETER_NULL = -27,

  INVALID_OPERATION_HANDLE = -28,

  INSUFFICIENT_BUFFER_SPACE = -29,

  VERIFICATION_FAILED = -30,

  TOO_MANY_OPERATIONS = -31,

  UNEXPECTED_NULL_POINTER = -32,

  INVALID_KEY_BLOB = -33,

  IMPORTED_KEY_NOT_ENCRYPTED = -34,

  IMPORTED_KEY_DECRYPTION_FAILED = -35,

  IMPORTED_KEY_NOT_SIGNED = -36,

  IMPORTED_KEY_VERIFICATION_FAILED = -37,

  INVALID_ARGUMENT = -38,

  UNSUPPORTED_TAG = -39,

  INVALID_TAG = -40,

  MEMORY_ALLOCATION_FAILED = -41,

  IMPORT_PARAMETER_MISMATCH = -44,

  SECURE_HW_ACCESS_DENIED = -45,

  OPERATION_CANCELLED = -46,

  CONCURRENT_ACCESS_CONFLICT = -47,

  SECURE_HW_BUSY = -48,

  SECURE_HW_COMMUNICATION_FAILED = -49,

  UNSUPPORTED_EC_FIELD = -50,

  MISSING_NONCE = -51,

  INVALID_NONCE = -52,

  MISSING_MAC_LENGTH = -53,

  KEY_RATE_LIMIT_EXCEEDED = -54,

  CALLER_NONCE_PROHIBITED = -55,

  KEY_MAX_OPS_EXCEEDED = -56,

  INVALID_MAC_LENGTH = -57,

  MISSING_MIN_MAC_LENGTH = -58,

  UNSUPPORTED_MIN_MAC_LENGTH = -59,

  UNSUPPORTED_KDF = -60,

  UNSUPPORTED_EC_CURVE = -61,

  KEY_REQUIRES_UPGRADE = -62,

  ATTESTATION_CHALLENGE_MISSING = -63,

  KEYMINT_NOT_CONFIGURED = -64,

  ATTESTATION_APPLICATION_ID_MISSING = -65,

  CANNOT_ATTEST_IDS = -66,

  ROLLBACK_RESISTANCE_UNAVAILABLE = -67,

  HARDWARE_TYPE_UNAVAILABLE = -68,

  PROOF_OF_PRESENCE_REQUIRED = -69,

  CONCURRENT_PROOF_OF_PRESENCE_REQUESTED = -70,

  NO_USER_CONFIRMATION = -71,

  DEVICE_LOCKED = -72,

  EARLY_BOOT_ENDED = -73,

  ATTESTATION_KEYS_NOT_PROVISIONED = -74,

  ATTESTATION_IDS_NOT_PROVISIONED = -75,

  INVALID_OPERATION = -76,

  STORAGE_KEY_UNSUPPORTED = -77,

  INCOMPATIBLE_MGF_DIGEST = -78,

  UNSUPPORTED_MGF_DIGEST = -79,

  MISSING_NOT_BEFORE = -80,

  MISSING_NOT_AFTER = -81,

  MISSING_ISSUER_SUBJECT = -82,

  INVALID_ISSUER_SUBJECT = -83,

  BOOT_LEVEL_EXCEEDED = -84,

  HARDWARE_NOT_YET_AVAILABLE = -85,

  UNIMPLEMENTED = -100,

  VERSION_MISMATCH = -101,

  UNKNOWN_ERROR = -1000,

  ROOT_OF_TRUST_ALREADY_SET = (-1) /* -1 */,

  UNSUPPORTED_PURPOSE = (-2) /* -2 */,

  INCOMPATIBLE_PURPOSE = (-3) /* -3 */,

  UNSUPPORTED_ALGORITHM = (-4) /* -4 */,

  INCOMPATIBLE_ALGORITHM = (-5) /* -5 */,

  UNSUPPORTED_KEY_SIZE = (-6) /* -6 */,

  UNSUPPORTED_BLOCK_MODE = (-7) /* -7 */,

  INCOMPATIBLE_BLOCK_MODE = (-8) /* -8 */,

  UNSUPPORTED_MAC_LENGTH = (-9) /* -9 */,

  UNSUPPORTED_PADDING_MODE = (-10) /* -10 */,

  INCOMPATIBLE_PADDING_MODE = (-11) /* -11 */,

  UNSUPPORTED_DIGEST = (-12) /* -12 */,

  INCOMPATIBLE_DIGEST = (-13) /* -13 */,

  INVALID_EXPIRATION_TIME = (-14) /* -14 */,

  INVALID_USER_ID = (-15) /* -15 */,

  INVALID_AUTHORIZATION_TIMEOUT = (-16) /* -16 */,

  UNSUPPORTED_KEY_FORMAT = (-17) /* -17 */,

  INCOMPATIBLE_KEY_FORMAT = (-18) /* -18 */,

  UNSUPPORTED_KEY_ENCRYPTION_ALGORITHM = (-19) /* -19 */,

  UNSUPPORTED_KEY_VERIFICATION_ALGORITHM = (-20) /* -20 */,

  INVALID_INPUT_LENGTH = (-21) /* -21 */,

  KEY_EXPORT_OPTIONS_INVALID = (-22) /* -22 */,

  DELEGATION_NOT_ALLOWED = (-23) /* -23 */,

  KEY_NOT_YET_VALID = (-24) /* -24 */,

  KEY_EXPIRED = (-25) /* -25 */,

  KEY_USER_NOT_AUTHENTICATED = (-26) /* -26 */,

  OUTPUT_PARAMETER_NULL = (-27) /* -27 */,

  INVALID_OPERATION_HANDLE = (-28) /* -28 */,

  INSUFFICIENT_BUFFER_SPACE = (-29) /* -29 */,

  VERIFICATION_FAILED = (-30) /* -30 */,

  TOO_MANY_OPERATIONS = (-31) /* -31 */,

  UNEXPECTED_NULL_POINTER = (-32) /* -32 */,

  INVALID_KEY_BLOB = (-33) /* -33 */,

  IMPORTED_KEY_NOT_ENCRYPTED = (-34) /* -34 */,

  IMPORTED_KEY_DECRYPTION_FAILED = (-35) /* -35 */,

  IMPORTED_KEY_NOT_SIGNED = (-36) /* -36 */,

  IMPORTED_KEY_VERIFICATION_FAILED = (-37) /* -37 */,

  INVALID_ARGUMENT = (-38) /* -38 */,

  UNSUPPORTED_TAG = (-39) /* -39 */,

  INVALID_TAG = (-40) /* -40 */,

  MEMORY_ALLOCATION_FAILED = (-41) /* -41 */,

  IMPORT_PARAMETER_MISMATCH = (-44) /* -44 */,

  SECURE_HW_ACCESS_DENIED = (-45) /* -45 */,

  OPERATION_CANCELLED = (-46) /* -46 */,

  CONCURRENT_ACCESS_CONFLICT = (-47) /* -47 */,

  SECURE_HW_BUSY = (-48) /* -48 */,

  SECURE_HW_COMMUNICATION_FAILED = (-49) /* -49 */,

  UNSUPPORTED_EC_FIELD = (-50) /* -50 */,

  MISSING_NONCE = (-51) /* -51 */,

  INVALID_NONCE = (-52) /* -52 */,

  MISSING_MAC_LENGTH = (-53) /* -53 */,

  KEY_RATE_LIMIT_EXCEEDED = (-54) /* -54 */,

  CALLER_NONCE_PROHIBITED = (-55) /* -55 */,

  KEY_MAX_OPS_EXCEEDED = (-56) /* -56 */,

  INVALID_MAC_LENGTH = (-57) /* -57 */,

  MISSING_MIN_MAC_LENGTH = (-58) /* -58 */,

  UNSUPPORTED_MIN_MAC_LENGTH = (-59) /* -59 */,

  UNSUPPORTED_KDF = (-60) /* -60 */,

  UNSUPPORTED_EC_CURVE = (-61) /* -61 */,

  KEY_REQUIRES_UPGRADE = (-62) /* -62 */,

  ATTESTATION_CHALLENGE_MISSING = (-63) /* -63 */,

  KEYMINT_NOT_CONFIGURED = (-64) /* -64 */,

  ATTESTATION_APPLICATION_ID_MISSING = (-65) /* -65 */,

  CANNOT_ATTEST_IDS = (-66) /* -66 */,

  ROLLBACK_RESISTANCE_UNAVAILABLE = (-67) /* -67 */,

  HARDWARE_TYPE_UNAVAILABLE = (-68) /* -68 */,

  PROOF_OF_PRESENCE_REQUIRED = (-69) /* -69 */,

  CONCURRENT_PROOF_OF_PRESENCE_REQUESTED = (-70) /* -70 */,

  NO_USER_CONFIRMATION = (-71) /* -71 */,

  DEVICE_LOCKED = (-72) /* -72 */,

  EARLY_BOOT_ENDED = (-73) /* -73 */,

  ATTESTATION_KEYS_NOT_PROVISIONED = (-74) /* -74 */,

  ATTESTATION_IDS_NOT_PROVISIONED = (-75) /* -75 */,

  INVALID_OPERATION = (-76) /* -76 */,

  STORAGE_KEY_UNSUPPORTED = (-77) /* -77 */,

  INCOMPATIBLE_MGF_DIGEST = (-78) /* -78 */,

  UNSUPPORTED_MGF_DIGEST = (-79) /* -79 */,

  MISSING_NOT_BEFORE = (-80) /* -80 */,

  MISSING_NOT_AFTER = (-81) /* -81 */,

  MISSING_ISSUER_SUBJECT = (-82) /* -82 */,

  INVALID_ISSUER_SUBJECT = (-83) /* -83 */,

  BOOT_LEVEL_EXCEEDED = (-84) /* -84 */,

  HARDWARE_NOT_YET_AVAILABLE = (-85) /* -85 */,

  MODULE_HASH_ALREADY_SET = (-86) /* -86 */,

  UNIMPLEMENTED = (-100) /* -100 */,

  VERSION_MISMATCH = (-101) /* -101 */,

  UNKNOWN_ERROR = (-1000) /* -1000 */,

}