From 233413cbf07bd457b6b92489a22fe37f9b1c3dcc Mon Sep 17 00:00:00 2001
From: "dkrahn@chromium.org"
 <dkrahn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 18 Oct 2013 02:05:24 +0000
Subject: Point to temporary attestation dbus methods during transition.

Multi-profile support is being added to cryptohome's attestation
methods.  Because chrome and cryptohome cannot be modified atomically,
copies of the existing methods have been created so we can transition in
stages.

BUG=chromium:205206
TEST=unit

Review URL: https://codereview.chromium.org/26893005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229277 0039d316-1c4b-4281-b951-d872f2087c98
---
 chromeos/dbus/cryptohome_client.cc | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'chromeos')

diff --git a/chromeos/dbus/cryptohome_client.cc b/chromeos/dbus/cryptohome_client.cc
index 86133ae..e862ffb 100644
--- a/chromeos/dbus/cryptohome_client.cc
+++ b/chromeos/dbus/cryptohome_client.cc
@@ -488,7 +488,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
       const AsyncMethodCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(
         cryptohome::kCryptohomeInterface,
-        cryptohome::kCryptohomeAsyncTpmAttestationFinishCertRequest);
+        cryptohome::kCryptohomeAsyncTpmAttestationFinishCertRequestOld);
     dbus::MessageWriter writer(&method_call);
     writer.AppendArrayOfBytes(
         reinterpret_cast<const uint8*>(pca_response.data()),
@@ -509,7 +509,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
       const BoolDBusMethodCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(
         cryptohome::kCryptohomeInterface,
-        cryptohome::kCryptohomeTpmAttestationDoesKeyExist);
+        cryptohome::kCryptohomeTpmAttestationDoesKeyExistOld);
     dbus::MessageWriter writer(&method_call);
     bool is_user_specific = (key_type == attestation::KEY_USER);
     writer.AppendBool(is_user_specific);
@@ -524,7 +524,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
       const DataMethodCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(
         cryptohome::kCryptohomeInterface,
-        cryptohome::kCryptohomeTpmAttestationGetCertificate);
+        cryptohome::kCryptohomeTpmAttestationGetCertificateOld);
     dbus::MessageWriter writer(&method_call);
     bool is_user_specific = (key_type == attestation::KEY_USER);
     writer.AppendBool(is_user_specific);
@@ -542,7 +542,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
       const DataMethodCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(
         cryptohome::kCryptohomeInterface,
-        cryptohome::kCryptohomeTpmAttestationGetPublicKey);
+        cryptohome::kCryptohomeTpmAttestationGetPublicKeyOld);
     dbus::MessageWriter writer(&method_call);
     bool is_user_specific = (key_type == attestation::KEY_USER);
     writer.AppendBool(is_user_specific);
@@ -560,7 +560,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
       const AsyncMethodCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(
         cryptohome::kCryptohomeInterface,
-        cryptohome::kCryptohomeTpmAttestationRegisterKey);
+        cryptohome::kCryptohomeTpmAttestationRegisterKeyOld);
     dbus::MessageWriter writer(&method_call);
     bool is_user_specific = (key_type == attestation::KEY_USER);
     writer.AppendBool(is_user_specific);
@@ -582,7 +582,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
       const AsyncMethodCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(
         cryptohome::kCryptohomeInterface,
-        cryptohome::kCryptohomeTpmAttestationSignEnterpriseChallenge);
+        cryptohome::kCryptohomeTpmAttestationSignEnterpriseChallengeOld);
     dbus::MessageWriter writer(&method_call);
     bool is_user_specific = (key_type == attestation::KEY_USER);
     writer.AppendBool(is_user_specific);
@@ -609,7 +609,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
       const AsyncMethodCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(
         cryptohome::kCryptohomeInterface,
-        cryptohome::kCryptohomeTpmAttestationSignSimpleChallenge);
+        cryptohome::kCryptohomeTpmAttestationSignSimpleChallengeOld);
     dbus::MessageWriter writer(&method_call);
     bool is_user_specific = (key_type == attestation::KEY_USER);
     writer.AppendBool(is_user_specific);
@@ -629,7 +629,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
       const DataMethodCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(
         cryptohome::kCryptohomeInterface,
-        cryptohome::kCryptohomeTpmAttestationGetKeyPayload);
+        cryptohome::kCryptohomeTpmAttestationGetKeyPayloadOld);
     dbus::MessageWriter writer(&method_call);
     bool is_user_specific = (key_type == attestation::KEY_USER);
     writer.AppendBool(is_user_specific);
@@ -648,7 +648,7 @@ class CryptohomeClientImpl : public CryptohomeClient {
       const BoolDBusMethodCallback& callback) OVERRIDE {
     dbus::MethodCall method_call(
         cryptohome::kCryptohomeInterface,
-        cryptohome::kCryptohomeTpmAttestationSetKeyPayload);
+        cryptohome::kCryptohomeTpmAttestationSetKeyPayloadOld);
     dbus::MessageWriter writer(&method_call);
     bool is_user_specific = (key_type == attestation::KEY_USER);
     writer.AppendBool(is_user_specific);
-- 
cgit v1.1