summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorShawn Willden <swillden@google.com>2016-01-27 12:49:09 -0700
committerShawn Willden <swillden@google.com>2016-01-28 16:24:17 -0700
commit4ed2d7ed2275735ddc4952f310badfa4dcbaf04e (patch)
treef369f87d6986ec11387b609da96397e87fb50760 /include
parente755a7186a41f5d7372daea842ddcf311908fe52 (diff)
downloadkeymaster-4ed2d7ed2275735ddc4952f310badfa4dcbaf04e.tar.gz
Add input to FinishOperationRequest message.
Change-Id: I30f4851399808c44f1af281e87acbe3e162ad3d0
Diffstat (limited to 'include')
-rw-r--r--include/keymaster/android_keymaster_messages.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/keymaster/android_keymaster_messages.h b/include/keymaster/android_keymaster_messages.h
index bc08dc3..008a616 100644
--- a/include/keymaster/android_keymaster_messages.h
+++ b/include/keymaster/android_keymaster_messages.h
@@ -65,7 +65,7 @@ enum AndroidKeymasterCommand {
* Note that this approach implies that GetVersionRequest and GetVersionResponse cannot be
* versioned.
*/
-const int32_t MAX_MESSAGE_VERSION = 2;
+const int32_t MAX_MESSAGE_VERSION = 3;
inline int32_t MessageVersion(uint8_t major_ver, uint8_t minor_ver, uint8_t /* subminor_ver */) {
int32_t message_version = -1;
switch (major_ver) {
@@ -83,6 +83,9 @@ inline int32_t MessageVersion(uint8_t major_ver, uint8_t minor_ver, uint8_t /* s
message_version = 2;
break;
}
+ case 2:
+ message_version = 3;
+ break;
};
return message_version;
}
@@ -337,6 +340,7 @@ struct FinishOperationRequest : public KeymasterMessage {
bool Deserialize(const uint8_t** buf_ptr, const uint8_t* end) override;
keymaster_operation_handle_t op_handle;
+ Buffer input;
Buffer signature;
AuthorizationSet additional_params;
};