Support input to "finish()" in AndroidKeymaster operations.
This CL does not yet take advantage of the simplifications that allowing
input to finish() provides. That will require updating the Java layer
first, to remove some assumptions and code that assume update() must
eventually consume all input.
Change-Id: Ie85896027a1d55ddec06750d19addbb1f5e462c8
diff --git a/operation.cpp b/operation.cpp
index c36531d..410c9aa 100644
--- a/operation.cpp
+++ b/operation.cpp
@@ -134,4 +134,22 @@
return true;
}
+keymaster_error_t Operation::UpdateForFinish(const AuthorizationSet& input_params,
+ const Buffer& input) {
+ if (!input_params.empty() || input.available_read()) {
+ size_t input_consumed;
+ Buffer output;
+ AuthorizationSet output_params;
+ keymaster_error_t error =
+ Update(input_params, input, &output_params, &output, &input_consumed);
+ if (error != KM_ERROR_OK)
+ return error;
+ assert(input_consumed == input.available_read());
+ assert(output_params.empty());
+ assert(output.available_read() == 0);
+ }
+
+ return KM_ERROR_OK;
+}
+
} // namespace keymaster