Update comments on now-unsed user ID and app ID tags.
I'd just remove them but Trusty keymaster has been generating keys with KM_TAG_ALL_USERS and KM_TAG_ALL_APPLICATIONS, so removing them without breaking those keys is tricky. Plus I think they may come back. Bug: 21845167 Change-Id: I3b807e3e4bee64eba72b7fa6f1ee1929c4ca9dd0
This commit is contained in:
parent
b1d948edec
commit
e1bce9625e
1 changed files with 4 additions and 6 deletions
|
@ -84,9 +84,8 @@ typedef enum {
|
|||
boot. */
|
||||
|
||||
/* User authentication */
|
||||
KM_TAG_ALL_USERS = KM_BOOL | 500, /* If key is usable by all users. */
|
||||
KM_TAG_USER_ID = KM_INT | 501, /* ID of authorized user. Disallowed if
|
||||
KM_TAG_ALL_USERS is present. */
|
||||
KM_TAG_ALL_USERS = KM_BOOL | 500, /* Reserved for future use -- ignore */
|
||||
KM_TAG_USER_ID = KM_INT | 501, /* Reserved for future use -- ignore */
|
||||
KM_TAG_USER_SECURE_ID = KM_LONG_REP | 502, /* Secure ID of authorized user or authenticator(s).
|
||||
Disallowed if KM_TAG_ALL_USERS or
|
||||
KM_TAG_NO_AUTH_REQUIRED is present. */
|
||||
|
@ -103,9 +102,8 @@ typedef enum {
|
|||
device is powered off. */
|
||||
|
||||
/* Application access control */
|
||||
KM_TAG_ALL_APPLICATIONS = KM_BOOL | 600, /* If key is usable by all applications. */
|
||||
KM_TAG_APPLICATION_ID = KM_BYTES | 601, /* ID of authorized application. Disallowed if
|
||||
KM_TAG_ALL_APPLICATIONS is present. */
|
||||
KM_TAG_ALL_APPLICATIONS = KM_BOOL | 600, /* Reserved for future use -- ignore */
|
||||
KM_TAG_APPLICATION_ID = KM_BYTES | 601, /* Reserved for fugure use -- ignore */
|
||||
|
||||
/*
|
||||
* Semantically unenforceable tags, either because they have no specific meaning or because
|
||||
|
|
Loading…
Reference in a new issue