diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/local_data.proto | 1 | ||||
| -rw-r--r-- | common/print_local_data_proto.cc | 6 | ||||
| -rw-r--r-- | common/tpm_manager_constants.h | 14 |
3 files changed, 14 insertions, 7 deletions
diff --git a/common/local_data.proto b/common/local_data.proto index 8bb714f..a6ba6e1 100644 --- a/common/local_data.proto +++ b/common/local_data.proto @@ -24,7 +24,6 @@ package tpm_manager; // when all the clients have the owner password injected, this protobuf is // cleared of all passwords. message LocalData { - optional bool owned_by_this_install = 1; optional bytes owner_password = 2; repeated string owner_dependency = 3; optional bytes endorsement_password = 4; diff --git a/common/print_local_data_proto.cc b/common/print_local_data_proto.cc index 81c0864..76cb98e 100644 --- a/common/print_local_data_proto.cc +++ b/common/print_local_data_proto.cc @@ -34,12 +34,6 @@ std::string GetProtoDebugStringWithIndent(const LocalData& value, std::string output = base::StringPrintf("[%s] {\n", value.GetTypeName().c_str()); - if (value.has_owned_by_this_install()) { - output += indent + " owned_by_this_install: "; - base::StringAppendF(&output, "%s", - value.owned_by_this_install() ? "true" : "false"); - output += "\n"; - } if (value.has_owner_password()) { output += indent + " owner_password: "; base::StringAppendF(&output, "%s", diff --git a/common/tpm_manager_constants.h b/common/tpm_manager_constants.h index eabf378..8d994cd 100644 --- a/common/tpm_manager_constants.h +++ b/common/tpm_manager_constants.h @@ -19,9 +19,23 @@ namespace tpm_manager { +// These constants are used to set up and access the D-Bus interface for +// TpmManager. constexpr char kTpmManagerServiceName[] = "org.chromium.TpmManager"; constexpr char kTpmManagerServicePath[] = "/org/chromium/TpmManager"; +// These constants define the ownership dependencies. On a chromeos system, +// there are dependencies on Attestation and InstallAttributes, but at the +// moment TpmManager has no clients, so we only add a dependency on Test. +// TODO(usanghi): Figure out a way to handle ownership dependencies +// dynamically (b/25341605). +constexpr const char* kTestDependency = "Test"; + +// Array to easily access the list of ownership dependencies. +// Note: When dependencies are added/removed from the above list, they should +// be modified here as well. +constexpr const char* kInitialTpmOwnerDependencies[] = { kTestDependency }; + } // namespace tpm_manager #endif // TPM_MANAGER_COMMON_TPM_MANAGER_CONSTANTS_H_ |