From 0f39256c68dc689b2eb8b604c4d39f17b9300363 Mon Sep 17 00:00:00 2001 From: Shawn Willden Date: Tue, 2 Jun 2015 09:00:52 -0600 Subject: Add AES-GCM mode. Bug: 19919114 Change-Id: I27efed097efbd93d587a50f5d82fad80a96e7527 --- android_keymaster_test_utils.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'android_keymaster_test_utils.h') diff --git a/android_keymaster_test_utils.h b/android_keymaster_test_utils.h index ede14f5..cefd3d3 100644 --- a/android_keymaster_test_utils.h +++ b/android_keymaster_test_utils.h @@ -188,13 +188,18 @@ class Keymaster1Test : public testing::TestWithParam { keymaster_error_t UpdateOperation(const std::string& message, std::string* output, size_t* input_consumed); keymaster_error_t UpdateOperation(const AuthorizationSet& additional_params, - const std::string& message, std::string* output, - size_t* input_consumed); + const std::string& message, AuthorizationSet* output_params, + std::string* output, size_t* input_consumed); keymaster_error_t FinishOperation(std::string* output); keymaster_error_t FinishOperation(const std::string& signature, std::string* output); keymaster_error_t FinishOperation(const AuthorizationSet& additional_params, - const std::string& signature, std::string* output); + const std::string& signature, std::string* output) { + return FinishOperation(additional_params, signature, nullptr /* output_params */, output); + } + keymaster_error_t FinishOperation(const AuthorizationSet& additional_params, + const std::string& signature, AuthorizationSet* output_params, + std::string* output); keymaster_error_t AbortOperation(); -- cgit v1.2.3