diff options
| author | Shawn Willden <swillden@google.com> | 2015-05-11 07:06:01 -0600 |
|---|---|---|
| committer | Shawn Willden <swillden@google.com> | 2015-05-12 11:29:27 +0000 |
| commit | 9b31a49c3633895d9a2bf08ddb2ea73f8e8d0c64 (patch) | |
| tree | 8059b41acc373a856b93114b08af32a7809437df /include/hardware/keymaster_defs.h | |
| parent | 7eb7235c3391c139040ff1477e15be718d6f41b4 (diff) | |
| download | hardware_libhardware-9b31a49c3633895d9a2bf08ddb2ea73f8e8d0c64.zip hardware_libhardware-9b31a49c3633895d9a2bf08ddb2ea73f8e8d0c64.tar.gz hardware_libhardware-9b31a49c3633895d9a2bf08ddb2ea73f8e8d0c64.tar.bz2 | |
Remove rescoping.
Rescoping was never a very good solution to the problem of supporting
multiple sets of authorizations for a given key material. For M we're
removing it and in the future a better solution will be provided.
Change-Id: I6f7585274487bd66e4d90e89014af41e9aa30411
(cherry picked from commit 7f10ab99fc63e99252d924b9e0bdfefef5374b40)
Diffstat (limited to 'include/hardware/keymaster_defs.h')
| -rw-r--r-- | include/hardware/keymaster_defs.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h index 9105ee9..1b43fb2 100644 --- a/include/hardware/keymaster_defs.h +++ b/include/hardware/keymaster_defs.h @@ -63,8 +63,6 @@ typedef enum { KM_TAG_CALLER_NONCE = KM_BOOL | 8, /* Allow caller to specify nonce or IV. */ /* Other hardware-enforced. */ - KM_TAG_RESCOPING_ADD = KM_ENUM_REP | 101, /* Tags authorized for addition via rescoping. */ - KM_TAG_RESCOPING_DEL = KM_ENUM_REP | 102, /* Tags authorized for removal via rescoping. */ KM_TAG_BLOB_USAGE_REQUIREMENTS = KM_ENUM | 705, /* keymaster_key_blob_usage_requirements_t */ /* Algorithm-specific. */ @@ -335,7 +333,6 @@ typedef enum { KM_ERROR_UNSUPPORTED_TAG = -39, KM_ERROR_INVALID_TAG = -40, KM_ERROR_MEMORY_ALLOCATION_FAILED = -41, - KM_ERROR_INVALID_RESCOPING = -42, KM_ERROR_IMPORT_PARAMETER_MISMATCH = -44, KM_ERROR_SECURE_HW_ACCESS_DENIED = -45, KM_ERROR_OPERATION_CANCELLED = -46, @@ -346,7 +343,6 @@ typedef enum { KM_ERROR_MISSING_NONCE = -51, KM_ERROR_INVALID_NONCE = -52, KM_ERROR_UNSUPPORTED_CHUNK_LENGTH = -53, - KM_ERROR_RESCOPABLE_KEY_NOT_USABLE = -54, KM_ERROR_CALLER_NONCE_PROHIBITED = -55, KM_ERROR_UNIMPLEMENTED = -100, |