commit 5da34d2f205623a05ca503d5c192a020b7740be1
author Shawn Willden <swillden@google.com> Tue Jan 20 11:44:47 2015 -0700
committer Shawn Willden <swillden@google.com> Tue Jan 20 11:44:47 2015 -0700
tree d3c1f4a2abe32f1f302f540d545f3775cd0f2bdb
parent 2dbe752a441cf8487b9b81772271e5abd18d0475

Revert "Refactor Update operation to return amount of input consumed."

This reverts commit 125febcb5d1888fa82e8c2eb307513598a537999.

google_keymaster_test.cpp

diff --git a/google_keymaster_test.cpp b/google_keymaster_test.cpp
index a786c4d..f6ee1d0 100644
--- a/google_keymaster_test.cpp
+++ b/google_keymaster_test.cpp
@@ -471,7 +471,6 @@
         device.UpdateOperation(update_request, &update_response);
         ASSERT_EQ(KM_ERROR_OK, update_response.error);
         EXPECT_EQ(0U, update_response.output.available_read());
-        EXPECT_EQ(size, update_response.input_consumed);
 
         FinishOperationRequest finish_request;
         finish_request.op_handle = begin_response.op_handle;
@@ -613,7 +612,6 @@
     device.UpdateOperation(update_request, &update_response);
     ASSERT_EQ(KM_ERROR_OK, update_response.error);
     EXPECT_EQ(0U, update_response.output.available_read());
-    EXPECT_EQ(31U, update_response.input_consumed);
 
     FinishOperationRequest finish_request;
     finish_request.op_handle = begin_response.op_handle;
@@ -653,7 +651,6 @@
         device.UpdateOperation(update_request, &update_response);
         ASSERT_EQ(KM_ERROR_OK, update_response.error);
         EXPECT_EQ(0U, update_response.output.available_read());
-        EXPECT_EQ(message_len, update_response.input_consumed);
 
         FinishOperationRequest finish_request;
         finish_request.op_handle = begin_response.op_handle;
@@ -971,7 +968,7 @@
     }
 
     keymaster_error_t UpdateOperation(uint64_t op_handle, const void* message, size_t size,
-                                      string* output, size_t* input_consumed) {
+                                      string* output) {
         UpdateOperationRequest update_request;
         update_request.op_handle = op_handle;
         update_request.input.Reinitialize(message, size);
@@ -981,7 +978,6 @@
         if (update_response.error == KM_ERROR_OK)
             output->append(reinterpret_cast<const char*>(update_response.output.peek_read()),
                            update_response.output.available_read());
-        *input_consumed = update_response.input_consumed;
         return update_response.error;
     }
 
@@ -1002,11 +998,8 @@
         EXPECT_EQ(KM_ERROR_OK, BeginOperation(purpose, key_blob, &op_handle));
 
         string result;
-        size_t input_consumed;
-        EXPECT_EQ(KM_ERROR_OK, UpdateOperation(op_handle, message, size, &result, &input_consumed));
-        EXPECT_EQ(size, input_consumed);
+        EXPECT_EQ(KM_ERROR_OK, UpdateOperation(op_handle, message, size, &result));
         EXPECT_EQ(KM_ERROR_OK, FinishOperation(op_handle, &result));
-
         return result;
     }
 
@@ -1060,12 +1053,10 @@
     const char message[] = "12345678901234567890123";
     uint64_t op_handle;
     string result;
-    size_t input_consumed;
 
     EXPECT_EQ(KM_ERROR_OK,
               BeginOperation(KM_PURPOSE_ENCRYPT, generate_response_.key_blob, &op_handle));
-    EXPECT_EQ(KM_ERROR_OK,
-              UpdateOperation(op_handle, message, array_size(message), &result, &input_consumed));
+    EXPECT_EQ(KM_ERROR_OK, UpdateOperation(op_handle, message, array_size(message), &result));
     EXPECT_EQ(KM_ERROR_INVALID_INPUT_LENGTH, FinishOperation(op_handle, &result));
     EXPECT_EQ(0, result.size());
 }
@@ -1081,11 +1072,10 @@
 
     uint64_t op_handle;
     string result;
-    size_t input_consumed;
     EXPECT_EQ(KM_ERROR_OK,
               BeginOperation(KM_PURPOSE_DECRYPT, generate_response_.key_blob, &op_handle));
-    EXPECT_EQ(KM_ERROR_OK, UpdateOperation(op_handle, ciphertext.data(), ciphertext.size(), &result,
-                                           &input_consumed));
+    EXPECT_EQ(KM_ERROR_OK,
+              UpdateOperation(op_handle, ciphertext.data(), ciphertext.size(), &result));
     EXPECT_EQ(KM_ERROR_UNKNOWN_ERROR, FinishOperation(op_handle, &result));
     EXPECT_EQ(0, result.size());
 }
@@ -1118,12 +1108,10 @@
     const char message[] = "1234567890123456789012345678901234567890123456789012";
     uint64_t op_handle;
     string result;
-    size_t input_consumed;
 
     EXPECT_EQ(KM_ERROR_OK,
               BeginOperation(KM_PURPOSE_ENCRYPT, generate_response_.key_blob, &op_handle));
-    EXPECT_EQ(KM_ERROR_OK,
-              UpdateOperation(op_handle, message, array_size(message), &result, &input_consumed));
+    EXPECT_EQ(KM_ERROR_OK, UpdateOperation(op_handle, message, array_size(message), &result));
     EXPECT_EQ(KM_ERROR_INVALID_INPUT_LENGTH, FinishOperation(op_handle, &result));
     EXPECT_EQ(0, result.size());
 }
@@ -1139,11 +1127,10 @@
 
     uint64_t op_handle;
     string result;
-    size_t input_consumed;
     EXPECT_EQ(KM_ERROR_OK,
               BeginOperation(KM_PURPOSE_DECRYPT, generate_response_.key_blob, &op_handle));
-    EXPECT_EQ(KM_ERROR_OK, UpdateOperation(op_handle, ciphertext.data(), ciphertext.size(), &result,
-                                           &input_consumed));
+    EXPECT_EQ(KM_ERROR_OK,
+              UpdateOperation(op_handle, ciphertext.data(), ciphertext.size(), &result));
     EXPECT_EQ(KM_ERROR_UNKNOWN_ERROR, FinishOperation(op_handle, &result));
     EXPECT_EQ(0, result.size());
 }