commit a5d7ebd9a39a382a644bcb44b80ec07e4ec061a0
author Shawn Willden <swillden@google.com> Wed Feb 17 19:42:22 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 17 19:42:22 2021 +0000
tree 562e67d42cb370a929555da217d673cb9b83a037
parent 864b71f5ffcb8675115bfb5d42349138600e8a1b
parent 41e68bfb1161a325168d185fe467c8b4ced1d2c9

Merge "Add ATTEST_KEY" am: 41e68bfb11

Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1584435

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I909a2e2b5aad3d1bcce88f055a4569621a6c97df

include/hardware/keymaster_defs.h

diff --git a/include/hardware/keymaster_defs.h b/include/hardware/keymaster_defs.h
index f6223ff..49f65a9 100644
--- a/include/hardware/keymaster_defs.h
+++ b/include/hardware/keymaster_defs.h
@@ -345,7 +345,7 @@
     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 @@
     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,