From 375f7d743d3be275520c9cf95ebef8f73f632476 Mon Sep 17 00:00:00 2001 From: Janis Danisevskis Date: Mon, 30 Nov 2020 00:09:08 -0800 Subject: [PATCH] KeyMint 1.0: Fix tag type of USER_SECURE_ID. Test: None Bug: 174445211 Change-Id: Ic8f346c58db875ee9fe4131f87de8c1bc5e9ec18 --- .../current/android/hardware/keymint/Tag.aidl | 2 +- keymint/aidl/android/hardware/keymint/Tag.aidl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/Tag.aidl b/keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/Tag.aidl index fba58afa5a..33a95fe38d 100644 --- a/keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/Tag.aidl +++ b/keymint/aidl/aidl_api/android.hardware.keymint/current/android/hardware/keymint/Tag.aidl @@ -41,7 +41,7 @@ enum Tag { MIN_SECONDS_BETWEEN_OPS = 805306771, MAX_USES_PER_BOOT = 805306772, USER_ID = 805306869, - USER_SECURE_ID = 1073742326, + USER_SECURE_ID = -1610612234, NO_AUTH_REQUIRED = 1879048695, USER_AUTH_TYPE = 268435960, AUTH_TIMEOUT = 805306873, diff --git a/keymint/aidl/android/hardware/keymint/Tag.aidl b/keymint/aidl/android/hardware/keymint/Tag.aidl index e85a8f5fa7..46da09658c 100644 --- a/keymint/aidl/android/hardware/keymint/Tag.aidl +++ b/keymint/aidl/android/hardware/keymint/Tag.aidl @@ -355,7 +355,7 @@ enum Tag { * * Must be hardware-enforced. */ - USER_SECURE_ID = (4 << 28) | 502, /* TagType:UINT_REP */ + USER_SECURE_ID = (10 << 28) | 502, /* TagType:ULONG_REP */ /** * Tag::NO_AUTH_REQUIRED specifies that no authentication is required to use this key. This tag