diff options
| author | Alex Klyubin <klyubin@google.com> | 2015-04-06 15:36:25 -0700 |
|---|---|---|
| committer | Alex Klyubin <klyubin@google.com> | 2015-04-07 09:18:00 -0700 |
| commit | c46e9e7da4558f6bc99262361fd1ca35c3a44090 (patch) | |
| tree | fe03eacff018dff328a9e954d307bf4734de0fa0 /core/java/android/security | |
| parent | 64b0062a373102f83837faade20b469685758139 (diff) | |
| download | frameworks_base-c46e9e7da4558f6bc99262361fd1ca35c3a44090.zip frameworks_base-c46e9e7da4558f6bc99262361fd1ca35c3a44090.tar.gz frameworks_base-c46e9e7da4558f6bc99262361fd1ca35c3a44090.tar.bz2 | |
Make the new AndroidKeyStore API conformant.
This makes the new AndroidKeyStore API conform with the latest
Keymaster API changes as well as the latest Android framework API
design guidelines.
Keymaster changes:
* Multiple paddings, block modes, and digests can be set on a key.
* "max uses per boot" and "min seconds between use" restrictions will
not be exposed in the framework API.
* Padding scheme ZERO will not be exposed.
Changes due to Android framework design guidelines:
* Sets of enum values have been replaced with bitsets represented as
ints.
* Integer has been replaced with int, with null being represented
with a special value (e.g., -1 or 0) where possible.
Bug: 18088752
Change-Id: Ib21739aa9b42d48895cb7a681e836a5c6d972ac6
Diffstat (limited to 'core/java/android/security')
| -rw-r--r-- | core/java/android/security/keymaster/KeymasterDefs.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/core/java/android/security/keymaster/KeymasterDefs.java b/core/java/android/security/keymaster/KeymasterDefs.java index e94a312..6176399 100644 --- a/core/java/android/security/keymaster/KeymasterDefs.java +++ b/core/java/android/security/keymaster/KeymasterDefs.java @@ -171,6 +171,9 @@ public final class KeymasterDefs { public static final int KM_KEY_FORMAT_PKCS12 = 2; public static final int KM_KEY_FORMAT_RAW = 3; + // User authenticators. + public static final int HW_AUTH_PASSWORD = 1 << 0; + // Error codes. public static final int KM_ERROR_OK = 0; public static final int KM_ERROR_ROOT_OF_TRUST_ALREADY_SET = -1; |