commit 950eb0b60ec477df1125f8e3553fefc59cafa709
author Shawn Willden <swillden@google.com> Wed Jan 06 19:15:29 2021 +0000
committer Shawn Willden <swillden@google.com> Wed Jan 06 19:54:59 2021 +0000
tree d2d45bf2bd707777d0ddf72ff937a17604ff33bf
parent ebbac3d4bce59f644ba523e47063543371831c87

Revert^2 "Revise KeymasterMessage versioning system"

ebbac3d4bce59f644ba523e47063543371831c87

Change-Id: I74c130c8fbfd4f975ffbee3a9d8924c48d3c29f5
Bug: 176867651
Merged-In: Icd6e8df352f8ec5d43a5a18e60d568c35902d588

ng/AndroidKeyMintOperation.cpp

diff --git a/ng/AndroidKeyMintOperation.cpp b/ng/AndroidKeyMintOperation.cpp
index 5f29b11..0e95c2f 100644
--- a/ng/AndroidKeyMintOperation.cpp
+++ b/ng/AndroidKeyMintOperation.cpp
@@ -57,7 +57,7 @@
         return kmError2ScopedAStatus(KM_ERROR_OUTPUT_PARAMETER_NULL);
     }
 
-    UpdateOperationRequest request;
+    UpdateOperationRequest request(impl_->message_version());
     request.op_handle = opHandle_;
     if (input) {
         request.input.Reinitialize(input->data(), input->size());
@@ -67,7 +67,7 @@
         request.additional_params.Reinitialize(KmParamSet(params->params));
     }
 
-    UpdateOperationResponse response;
+    UpdateOperationResponse response(impl_->message_version());
     impl_->UpdateOperation(request, &response);
 
     *inputConsumed = 0;
@@ -101,7 +101,7 @@
             static_cast<int32_t>(ErrorCode::OUTPUT_PARAMETER_NULL)));
     }
 
-    FinishOperationRequest request;
+    FinishOperationRequest request(impl_->message_version());
     request.op_handle = opHandle_;
 
     if (input) {
@@ -116,7 +116,7 @@
         request.additional_params.Reinitialize(KmParamSet(params->params));
     }
 
-    FinishOperationResponse response;
+    FinishOperationResponse response(impl_->message_version());
     impl_->FinishOperation(request, &response);
     opHandle_ = 0;
 
@@ -132,10 +132,10 @@
 }
 
 ScopedAStatus AndroidKeyMintOperation::abort() {
-    AbortOperationRequest request;
+    AbortOperationRequest request(impl_->message_version());
     request.op_handle = opHandle_;
 
-    AbortOperationResponse response;
+    AbortOperationResponse response(impl_->message_version());
     impl_->AbortOperation(request, &response);
     opHandle_ = 0;