diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-06-03 17:25:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-03 17:25:38 +0000 |
| commit | 85f4b7b38cedddfb0ed9f57555fb81aceca786ac (patch) | |
| tree | 574e55701cfaa364bc7d38b51517a61bb0a3e34f /core/java/android/security | |
| parent | 4f31c07fdd5a9cc442e499d5500924330c2813ae (diff) | |
| parent | 4699e43dc6370bd649c7b7cdfba06ca384ca42fe (diff) | |
| download | frameworks_base-85f4b7b38cedddfb0ed9f57555fb81aceca786ac.zip frameworks_base-85f4b7b38cedddfb0ed9f57555fb81aceca786ac.tar.gz frameworks_base-85f4b7b38cedddfb0ed9f57555fb81aceca786ac.tar.bz2 | |
Merge "Fix block mode numbering (CTR got added as 4 rather than 3)" into mnc-dev
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 b450a6b..6e40c6c 100644 --- a/core/java/android/security/keymaster/KeymasterDefs.java +++ b/core/java/android/security/keymaster/KeymasterDefs.java @@ -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; |