Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(286)

Side by Side Diff: chromeos/dbus/mock_cryptohome_client.h

Issue 13638022: Added an options parameter to TpmAttestationSignEnterpriseChallenge. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chromeos/dbus/cryptohome_client.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROMEOS_DBUS_MOCK_CRYPTOHOME_CLIENT_H_ 5 #ifndef CHROMEOS_DBUS_MOCK_CRYPTOHOME_CLIENT_H_
6 #define CHROMEOS_DBUS_MOCK_CRYPTOHOME_CLIENT_H_ 6 #define CHROMEOS_DBUS_MOCK_CRYPTOHOME_CLIENT_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "chromeos/dbus/cryptohome_client.h" 10 #include "chromeos/dbus/cryptohome_client.h"
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 const std::string& key_name, 100 const std::string& key_name,
101 const DataMethodCallback& callback)); 101 const DataMethodCallback& callback));
102 MOCK_METHOD3(TpmAttestationGetPublicKey, 102 MOCK_METHOD3(TpmAttestationGetPublicKey,
103 void(AttestationKeyType key_type, 103 void(AttestationKeyType key_type,
104 const std::string& key_name, 104 const std::string& key_name,
105 const DataMethodCallback& callback)); 105 const DataMethodCallback& callback));
106 MOCK_METHOD3(TpmAttestationRegisterKey, 106 MOCK_METHOD3(TpmAttestationRegisterKey,
107 void(AttestationKeyType key_type, 107 void(AttestationKeyType key_type,
108 const std::string& key_name, 108 const std::string& key_name,
109 const AsyncMethodCallback& callback)); 109 const AsyncMethodCallback& callback));
110 MOCK_METHOD6(TpmAttestationSignEnterpriseChallenge, 110 MOCK_METHOD7(TpmAttestationSignEnterpriseChallenge,
111 void(AttestationKeyType key_type, 111 void(AttestationKeyType key_type,
112 const std::string& key_name, 112 const std::string& key_name,
113 const std::string& domain, 113 const std::string& domain,
114 const std::string& device_id, 114 const std::string& device_id,
115 AttestationChallengeOptions options,
115 const std::string& challenge, 116 const std::string& challenge,
116 const AsyncMethodCallback& callback)); 117 const AsyncMethodCallback& callback));
117 MOCK_METHOD4(TpmAttestationSignSimpleChallenge, 118 MOCK_METHOD4(TpmAttestationSignSimpleChallenge,
118 void(AttestationKeyType key_type, 119 void(AttestationKeyType key_type,
119 const std::string& key_name, 120 const std::string& key_name,
120 const std::string& challenge, 121 const std::string& challenge,
121 const AsyncMethodCallback& callback)); 122 const AsyncMethodCallback& callback));
122 }; 123 };
123 124
124 } // namespace chromeos 125 } // namespace chromeos
125 126
126 #endif // CHROMEOS_DBUS_MOCK_CRYPTOHOME_CLIENT_H_ 127 #endif // CHROMEOS_DBUS_MOCK_CRYPTOHOME_CLIENT_H_
OLDNEW
« no previous file with comments | « chromeos/dbus/cryptohome_client.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698