summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn Willden <swillden@google.com>2021-02-17 20:49:09 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-17 20:49:09 +0000
commit6cb2144e0ee42b8b4a0de66f5c565e3faff09226 (patch)
treed6d2b808da3f8e297f5ff83c3eb0cbde519ccd4d
parent70ded94cf6570af7835d6b0f7229dc344c188c8d (diff)
parentd34829254cdb4f946986e2a7fa41a0b030cfc485 (diff)
downloadlibhardware-6cb2144e0ee42b8b4a0de66f5c565e3faff09226.tar.gz
Merge "Add ATTEST_KEY" am: 41e68bfb11 am: a5d7ebd9a3 am: d34829254c
Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1584435 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5b34e86622d8b0505ed76621cf2ebbce1b9190fd
-rw-r--r--include/hardware/keymaster_defs.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h
index f6223ffb..49f65a9a 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -345,7 +345,7 @@ typedef enum {
KM_PURPOSE_DERIVE_KEY = 4, /* Usable with EC keys. */
KM_PURPOSE_WRAP = 5, /* Usable with wrapped keys. */
KM_PURPOSE_AGREE_KEY = 6, /* Usable with EC keys. */
-
+ KM_PURPOSE_ATTEST_KEY = 7 /* Usabe with RSA and EC keys */
} keymaster_purpose_t;
typedef struct {
@@ -510,6 +510,8 @@ typedef enum {
KM_ERROR_UNSUPPORTED_MGF_DIGEST = -79,
KM_ERROR_MISSING_NOT_BEFORE = -80,
KM_ERROR_MISSING_NOT_AFTER = -81,
+ KM_ERROR_MISSING_ISSUER_SUBJECT = -82,
+ KM_ERROR_INVALID_ISSUER_SUBJECT = -83,
KM_ERROR_UNIMPLEMENTED = -100,
KM_ERROR_VERSION_MISMATCH = -101,