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

am 85f4b7b3: Merge "Fix block mode numbering (CTR got added as 4 rather than 3)" into mnc-dev

Browse Source 
* commit '85f4b7b38cedddfb0ed9f57555fb81aceca786ac':
  Fix block mode numbering (CTR got added as 4 rather than 3)
This commit is contained in:
Alex Klyubin
2015-06-03 18:13:03 +00:00
committed by Android Git Automerger
parent 0a11518598 85f4b7b38c
commit 0623bc8ae2
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,12 +92,10 @@ public final class KeymasterDefs {
public static final int KM_ALGORITHM_HMAC = 128;
// Block modes.
public static final int KM_MODE_FIRST_UNAUTHENTICATED = 1;
public static final int KM_MODE_ECB = KM_MODE_FIRST_UNAUTHENTICATED;
public static final int KM_MODE_ECB = 1;
public static final int KM_MODE_CBC = 2;
public static final int KM_MODE_CTR = 4;
public static final int KM_MODE_FIRST_AUTHENTICATED = 32;
public static final int KM_MODE_GCM = KM_MODE_FIRST_AUTHENTICATED;
public static final int KM_MODE_CTR = 3;
public static final int KM_MODE_GCM = 32;
// Padding modes.
public static final int KM_PAD_NONE = 1;