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.

rsa_operation.cpp

diff --git a/rsa_operation.cpp b/rsa_operation.cpp
index 14df611..df39006 100644
--- a/rsa_operation.cpp
+++ b/rsa_operation.cpp
@@ -34,9 +34,7 @@
         RSA_free(rsa_key_);
 }
 
-keymaster_error_t RsaOperation::Update(const Buffer& input, Buffer* /* output */,
-                                       size_t* input_consumed) {
-    assert(input_consumed);
+keymaster_error_t RsaOperation::Update(const Buffer& input, Buffer* /* output */) {
     switch (purpose()) {
     default:
         return KM_ERROR_UNIMPLEMENTED;
@@ -44,21 +42,18 @@
     case KM_PURPOSE_VERIFY:
     case KM_PURPOSE_ENCRYPT:
     case KM_PURPOSE_DECRYPT:
-        return StoreData(input, input_consumed);
+        return StoreData(input);
     }
 }
 
-keymaster_error_t RsaOperation::StoreData(const Buffer& input, size_t* input_consumed) {
-    assert(input_consumed);
+keymaster_error_t RsaOperation::StoreData(const Buffer& input) {
     if (!data_.reserve(data_.available_read() + input.available_read()) ||
         !data_.write(input.peek_read(), input.available_read()))
         return KM_ERROR_MEMORY_ALLOCATION_FAILED;
-    *input_consumed = input.available_read();
     return KM_ERROR_OK;
 }
 
 keymaster_error_t RsaSignOperation::Finish(const Buffer& /* signature */, Buffer* output) {
-    assert(output);
     output->Reinitialize(RSA_size(rsa_key_));
     int bytes_encrypted = RSA_private_encrypt(data_.available_read(), data_.peek_read(),
                                               output->peek_write(), rsa_key_, RSA_NO_PADDING);
@@ -100,7 +95,6 @@
 const int PKCS1_PADDING_OVERHEAD = 11;
 
 keymaster_error_t RsaEncryptOperation::Finish(const Buffer& /* signature */, Buffer* output) {
-    assert(output);
     int openssl_padding;
 
 #if defined(OPENSSL_IS_BORINGSSL)
@@ -148,7 +142,6 @@
 }
 
 keymaster_error_t RsaDecryptOperation::Finish(const Buffer& /* signature */, Buffer* output) {
-    assert(output);
     int openssl_padding;
     switch (padding_) {
     case KM_PAD_RSA_OAEP: