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

Commit 59f977c6 authored by Chad Brubaker's avatar Chad Brubaker Committed by Shawn Willden
Browse files

Make several key crypto parameters repeatable 

Bug: 19509156
Change-Id: Ic584d8a6bf5601f9754563b67b3cc6b3ca6b5ff9
parent a270264c

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

+6 −6
Original line number Diff line number Diff line
@@ -47,12 +47,11 @@ public final class KeymasterDefs { 
    public static final int KM_TAG_PURPOSE = KM_ENUM_REP | 1;

    public static final int KM_TAG_ALGORITHM = KM_ENUM | 2;

    public static final int KM_TAG_KEY_SIZE = KM_INT | 3;

    public static final int KM_TAG_BLOCK_MODE = KM_ENUM | 4;

    public static final int KM_TAG_DIGEST = KM_ENUM | 5;

    public static final int KM_TAG_MAC_LENGTH = KM_INT | 6;

    public static final int KM_TAG_PADDING = KM_ENUM | 7;

    public static final int KM_TAG_RETURN_UNAUTHED = KM_BOOL | 8;

    public static final int KM_TAG_CALLER_NONCE = KM_BOOL | 9;

    public static final int KM_TAG_BLOCK_MODE = KM_ENUM_REP | 4;

    public static final int KM_TAG_DIGEST = KM_ENUM_REP | 5;

    public static final int KM_TAG_PADDING = KM_ENUM_REP | 6;

    public static final int KM_TAG_RETURN_UNAUTHED = KM_BOOL | 7;

    public static final int KM_TAG_CALLER_NONCE = KM_BOOL | 8;



    public static final int KM_TAG_RESCOPING_ADD = KM_ENUM_REP | 101;

    public static final int KM_TAG_RESCOPING_DEL = KM_ENUM_REP | 102;
@@ -85,6 +84,7 @@ public final class KeymasterDefs { 
    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;

    public static final int KM_TAG_MAC_LENGTH = KM_INT | 1004;



    // Algorithm values.

    public static final int KM_ALGORITHM_RSA = 1;