diff options
| author | Shawn Willden <swillden@google.com> | 2015-06-02 09:00:52 -0600 |
|---|---|---|
| committer | Shawn Willden <swillden@google.com> | 2015-06-03 00:54:22 -0600 |
| commit | 0f39256c68dc689b2eb8b604c4d39f17b9300363 (patch) | |
| tree | a386065e9dc4ebfa895b420544f2e720ace68420 /android_keymaster_test_utils.h | |
| parent | ded8e7d0ad241fc0a930dbebbd9f2e2bf4e929a2 (diff) | |
| download | android_system_keymaster-0f39256c68dc689b2eb8b604c4d39f17b9300363.tar.gz android_system_keymaster-0f39256c68dc689b2eb8b604c4d39f17b9300363.tar.bz2 android_system_keymaster-0f39256c68dc689b2eb8b604c4d39f17b9300363.zip | |
Add AES-GCM mode.
Bug: 19919114
Change-Id: I27efed097efbd93d587a50f5d82fad80a96e7527
Diffstat (limited to 'android_keymaster_test_utils.h')
| -rw-r--r-- | android_keymaster_test_utils.h | 11 |
1 files changed, 8 insertions, 3 deletions
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<InstanceCreatorPtr> { 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(); |