diff options
| author | dkrahn@google.com <dkrahn@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 00:51:00 +0000 |
|---|---|---|
| committer | dkrahn@google.com <dkrahn@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 00:51:00 +0000 |
| commit | fd18b738a0bb9e6566e4bb6f0f54fd7b7acd0e91 (patch) | |
| tree | 71a92780555a91a071121c24c5fd3903bd809249 /chromeos/cryptohome/mock_async_method_caller.h | |
| parent | 1f4179d338752230bc910214cbb85cf769ffdaa1 (diff) | |
| download | chromium_src-fd18b738a0bb9e6566e4bb6f0f54fd7b7acd0e91.zip chromium_src-fd18b738a0bb9e6566e4bb6f0f54fd7b7acd0e91.tar.gz chromium_src-fd18b738a0bb9e6566e4bb6f0f54fd7b7acd0e91.tar.bz2 | |
Added an options parameter to TpmAttestationSignEnterpriseChallenge.
Cryptohome now supports including a SignedPublicKeyAndChallenge embedded
in a challenge response. The new options parameter allows a caller to
request that this be included.
BUG=chromium:219965
TEST=chromeos_unittests
Review URL: https://chromiumcodereview.appspot.com/13638022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192976 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/cryptohome/mock_async_method_caller.h')
| -rw-r--r-- | chromeos/cryptohome/mock_async_method_caller.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/chromeos/cryptohome/mock_async_method_caller.h b/chromeos/cryptohome/mock_async_method_caller.h index c4e2ec1..8fc2b8b 100644 --- a/chromeos/cryptohome/mock_async_method_caller.h +++ b/chromeos/cryptohome/mock_async_method_caller.h @@ -56,13 +56,15 @@ class MockAsyncMethodCaller : public AsyncMethodCaller { void(chromeos::CryptohomeClient::AttestationKeyType key_type, const std::string& key_name, const Callback& callback)); - MOCK_METHOD6(TpmAttestationSignEnterpriseChallenge, - void(chromeos::CryptohomeClient::AttestationKeyType key_type, - const std::string& key_name, - const std::string& domain, - const std::string& device_id, - const std::string& challenge, - const DataCallback& callback)); + MOCK_METHOD7( + TpmAttestationSignEnterpriseChallenge, + void(chromeos::CryptohomeClient::AttestationKeyType key_type, + const std::string& key_name, + const std::string& domain, + const std::string& device_id, + chromeos::CryptohomeClient::AttestationChallengeOptions options, + const std::string& challenge, + const DataCallback& callback)); MOCK_METHOD4(TpmAttestationSignSimpleChallenge, void(chromeos::CryptohomeClient::AttestationKeyType key_type, const std::string& key_name, |