diff options
| author | Shawn Willden <swillden@google.com> | 2015-04-10 22:12:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-10 22:12:53 +0000 |
| commit | 46bcfb64fb845b2ca9448aabe1a70292f61b483d (patch) | |
| tree | 4749f1fe163a10a6d7184fb06892cd85df2cde8a /core/java | |
| parent | 9aac7f7038845e5324ed87b01585d888ba5f3793 (diff) | |
| parent | c88e1396db12e430dde63afc3d44c1f37a7fce79 (diff) | |
| download | frameworks_base-46bcfb64fb845b2ca9448aabe1a70292f61b483d.zip frameworks_base-46bcfb64fb845b2ca9448aabe1a70292f61b483d.tar.gz frameworks_base-46bcfb64fb845b2ca9448aabe1a70292f61b483d.tar.bz2 | |
am c88e1396: am 99f4ac14: am 97fce66f: Merge "Make several key crypto parameters repeatable"
* commit 'c88e1396db12e430dde63afc3d44c1f37a7fce79':
Make several key crypto parameters repeatable
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/security/keymaster/KeymasterDefs.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/java/android/security/keymaster/KeymasterDefs.java b/core/java/android/security/keymaster/KeymasterDefs.java index e16691c..ea53c0d 100644 --- a/core/java/android/security/keymaster/KeymasterDefs.java +++ b/core/java/android/security/keymaster/KeymasterDefs.java @@ -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; |