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

am 687b3259: am 09614808: Merge "Reflect removal of KM_TAG_AEAD_TAG from keymaster." into mnc-dev

Browse Source 
* commit '687b32591b29442a5c2d181e7acd72a94ce93eab':
  Reflect removal of KM_TAG_AEAD_TAG from keymaster.
This commit is contained in:
Shawn Willden
2015-06-19 13:59:03 +00:00
committed by Android Git Automerger
parent 2f35f155d3 687b32591b
commit bb399afc52
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,8 +81,8 @@ public final class KeymasterDefs {
public static final int KM_TAG_ASSOCIATED_DATA = KM_BYTES | 1000; 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_NONCE = KM_BYTES | 1001;
public static final int KM_TAG_AUTH_TOKEN = KM_BYTES | 1003; public static final int KM_TAG_AUTH_TOKEN = KM_BYTES | 1002;
public static final int KM_TAG_MAC_LENGTH = KM_INT | 1004; public static final int KM_TAG_MAC_LENGTH = KM_INT | 1003;
// Algorithm values. // Algorithm values.
public static final int KM_ALGORITHM_RSA = 1; public static final int KM_ALGORITHM_RSA = 1;