Chromium Code Reviews| Index: service.cc |
| diff --git a/service.cc b/service.cc |
| index ed47224568e5c6a38f6111187bcefbf06fd759ed..0130b31fd33a64d7467a24a3521c7a83009fbd34 100644 |
| --- a/service.cc |
| +++ b/service.cc |
| @@ -1,4 +1,4 @@ |
| -// Copyright (c) 2009 The Chromium OS Authors. All rights reserved. |
| +// Copyright (c) 2011 The Chromium OS Authors. All rights reserved. |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| @@ -81,6 +81,8 @@ Service::Service() |
| mount_(default_mount_.get()), |
| default_tpm_init_(new TpmInit()), |
| tpm_init_(default_tpm_init_.get()), |
| + default_pkcs11_init_(new Pkcs11Init()), |
|
gauravsh
2011/04/08 21:37:35
pkcs11_init_ is just a helper pointer to avoid say
kmixter1
2011/04/08 21:56:39
Just mimicking tpm_init_ here. I suspect Fes/Will
|
| + pkcs11_init_(default_pkcs11_init_.get()), |
| initialize_tpm_(true), |
| mount_thread_(kMountThreadName), |
| async_complete_signal_(-1), |
| @@ -567,6 +569,20 @@ gboolean Service::TpmClearStoredPassword(GError** error) { |
| return TRUE; |
| } |
| +gboolean Service::Pkcs11IsReady(gboolean* OUT_ready, GError** error) { |
| + // TODO(kmixter/gauravsh): Base this on PKCS#11 really being initialized. |
| + *OUT_ready = TRUE; |
| + return TRUE; |
| +} |
| + |
| +gboolean Service::Pkcs11GetTpmTokenInfo(gchar** OUT_label, |
| + gchar** OUT_user_pin, |
| + GError** error) { |
| + pkcs11_init_->GetTpmTokenInfo(OUT_label, |
| + OUT_user_pin); |
| + return TRUE; |
| +} |
| + |
| gboolean Service::GetStatusString(gchar** OUT_status, GError** error) { |
| Tpm::TpmStatusInfo tpm_status; |
| mount_->get_crypto()->EnsureTpm(false); |