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

Commit 615f39f9 authored by Shawn Willden's avatar Shawn Willden Committed by Android Git Automerger
Browse files

am 254c58c4: Merge changes Id9a22ad3,I629ab2c4 

* commit '254c58c4':
  Add KM_TAG_AUTH_TOKEN.
  Add support for KM_TAG_USER_SECURE_ID.
parents 8b8a0451 254c58c4

core/java/android/security/keymaster/KeymasterDefs.java

+6 −3
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ public final class KeymasterDefs { 
    public static final int KM_BOOL = 7 << 28;

    public static final int KM_BIGNUM = 8 << 28;

    public static final int KM_BYTES = 9 << 28;

    public static final int KM_LONG_REP = 10 << 28;



    // Tag values.

    public static final int KM_TAG_INVALID = KM_INVALID | 0;
@@ -66,9 +67,10 @@ public final class KeymasterDefs { 


    public static final int KM_TAG_ALL_USERS = KM_BOOL | 500;

    public static final int KM_TAG_USER_ID = KM_INT | 501;

    public static final int KM_TAG_NO_AUTH_REQUIRED = KM_BOOL | 502;

    public static final int KM_TAG_USER_AUTH_ID = KM_INT_REP | 503;

    public static final int KM_TAG_AUTH_TIMEOUT = KM_INT | 504;

    public static final int KM_TAG_USER_SECURE_ID = KM_LONG_REP | 502;

    public static final int KM_TAG_NO_AUTH_REQUIRED = KM_BOOL | 503;

    public static final int KM_TAG_USER_AUTH_ID = KM_INT_REP | 504;

    public static final int KM_TAG_AUTH_TIMEOUT = KM_INT | 505;



    public static final int KM_TAG_ALL_APPLICATIONS = KM_BOOL | 600;

    public static final int KM_TAG_APPLICATION_ID = KM_BYTES | 601;
@@ -82,6 +84,7 @@ public final class KeymasterDefs { 
    public static final int KM_TAG_ASSOCIATED_DATA = KM_BYTES | 1000;

    public static final int KM_TAG_NONCE = KM_BYTES | 1001;

    public static final int KM_TAG_CHUNK_LENGTH = KM_INT | 1002;

    public static final int KM_TAG_AUTH_TOKEN = KM_BYTES | 1003;



    // Algorithm values.

    public static final int KM_ALGORITHM_RSA = 1;