diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-06-01 13:01:54 -0700 |
|---|---|---|
| committer | Alex Klyubin <klyubin@google.com> | 2015-06-03 09:36:51 -0700 |
| commit | 4699e43dc6370bd649c7b7cdfba06ca384ca42fe (patch) | |
| tree | 9deeefe2ff825cd7753f43590dcc864be13d6515 /core/java/android/security | |
| parent | 3aa33b3da04774d76e1a65b749667450dc81532b (diff) | |
| download | frameworks_base-4699e43dc6370bd649c7b7cdfba06ca384ca42fe.zip frameworks_base-4699e43dc6370bd649c7b7cdfba06ca384ca42fe.tar.gz frameworks_base-4699e43dc6370bd649c7b7cdfba06ca384ca42fe.tar.bz2 | |
Fix block mode numbering (CTR got added as 4 rather than 3)
Change-Id: I8c886c67ba081255ef18eb0f99ca1e6003fabb33
Diffstat (limited to 'core/java/android/security')
| -rw-r--r-- | core/java/android/security/keymaster/KeymasterDefs.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/core/java/android/security/keymaster/KeymasterDefs.java b/core/java/android/security/keymaster/KeymasterDefs.java index 0e2b8ba..b354b6c 100644 --- a/core/java/android/security/keymaster/KeymasterDefs.java +++ b/core/java/android/security/keymaster/KeymasterDefs.java @@ -93,12 +93,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; |