Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make several key crypto parameters repeatable"

Browse Source
This commit is contained in:
Shawn Willden
2015-04-10 21:21:36 +00:00
committed by Gerrit Code Review
parent 4406568eba 59f977c698
commit 97fce66f7d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/security/keymaster/KeymasterDefs.java
View File

@@ -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;