cryptohome: Add stub functions to query PKCS11 set up status

cryptohome: Add stub functions to query PKCS11 set up status

Change-Id: I9fc410ef8c39ae82f6764195b9cca21f0466d278

BUG=chromium-os:12296
TEST=BVTs plus:
localhost ~ # dbus-send --system --dest=org.chromium.Cryptohome --type=method_call --print-reply /org/chromium/Cryptohome org.chromium.CryptohomeInterface.Pkcs11GetTpmTokenInfo
method return sender=:1.14 -> dest=:1.99 reply_serial=2
   string "TPM"
   string "111111"

localhost ~ # dbus-send --system --dest=org.chromium.Cryptohome --type=method_call --print-reply /org/chromium/Cryptohome org.chromium.CryptohomeInterface.Pkcs11IsTpmTokenReady
method return sender=:1.14 -> dest=:1.100 reply_serial=2
   boolean true

Committed: http://chrome-svn/viewvc/chromeos?view=rev&revision=eedaa00

[Greg Spencer (Chromium), 2011-04-08 20:21:45]

http://codereview.chromium.org/6823012/diff/1/cryptohome.xml
File cryptohome.xml (right):

http://codereview.chromium.org/6823012/diff/1/cryptohome.xml#newcode2
cryptohome.xml:2: <!-- COPYRIGHT HERE
Doesn't this have to actually have copyright text?

http://codereview.chromium.org/6823012/diff/1/interface.cc
File interface.cc (right):

http://codereview.chromium.org/6823012/diff/1/interface.cc#newcode1
interface.cc:1: // Copyright (c) 2009 The Chromium OS Authors. All rights
reserved.
Update copyright

http://codereview.chromium.org/6823012/diff/1/interface.h
File interface.h (right):

http://codereview.chromium.org/6823012/diff/1/interface.h#newcode1
interface.h:1: // Copyright (c) 2009 The Chromium OS Authors. All rights
reserved.
Update copyright.

http://codereview.chromium.org/6823012/diff/1/pkcs11_init.cc
File pkcs11_init.cc (right):

http://codereview.chromium.org/6823012/diff/1/pkcs11_init.cc#newcode1
pkcs11_init.cc:1: // Copyright (c) 2009-2010 The Chromium OS Authors. All rights
reserved.
Should just be "2011"

http://codereview.chromium.org/6823012/diff/1/pkcs11_init.cc#newcode22
pkcs11_init.cc:22: const CK_CHAR kDefaultOpencryptokiSoPin[] = "87654321";
What are these "Opencryptoki" PINs used for, and why are they different from the
"Default" PINs?

In fact, except for the three things used in GetTpmTokenInfo, I don't see why
any of these are here...

http://codereview.chromium.org/6823012/diff/1/pkcs11_init.h
File pkcs11_init.h (right):

http://codereview.chromium.org/6823012/diff/1/pkcs11_init.h#newcode1
pkcs11_init.h:1: // Copyright (c) 2009-2010 The Chromium OS Authors. All rights
reserved.
Should just be "2011"

http://codereview.chromium.org/6823012/diff/1/service.cc
File service.cc (right):

http://codereview.chromium.org/6823012/diff/1/service.cc#newcode1
service.cc:1: // Copyright (c) 2009 The Chromium OS Authors. All rights
reserved.
Update copyright

http://codereview.chromium.org/6823012/diff/1/service.h
File service.h (right):

http://codereview.chromium.org/6823012/diff/1/service.h#newcode1
service.h:1: // Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
Update Copyright.

[kmixter1, 2011-04-08 21:04:14]

Responded to all comments.

http://codereview.chromium.org/6823012/diff/1/cryptohome.xml
File cryptohome.xml (right):

http://codereview.chromium.org/6823012/diff/1/cryptohome.xml#newcode2
cryptohome.xml:2: <!-- COPYRIGHT HERE
On 2011/04/08 20:21:45, Greg Spencer (Chromium) wrote:
> Doesn't this have to actually have copyright text?

Done.

http://codereview.chromium.org/6823012/diff/1/interface.cc
File interface.cc (right):

http://codereview.chromium.org/6823012/diff/1/interface.cc#newcode1
interface.cc:1: // Copyright (c) 2009 The Chromium OS Authors. All rights
reserved.
On 2011/04/08 20:21:45, Greg Spencer (Chromium) wrote:
> Update copyright

Done.

http://codereview.chromium.org/6823012/diff/1/interface.h
File interface.h (right):

http://codereview.chromium.org/6823012/diff/1/interface.h#newcode1
interface.h:1: // Copyright (c) 2009 The Chromium OS Authors. All rights
reserved.
On 2011/04/08 20:21:45, Greg Spencer (Chromium) wrote:
> Update copyright.

Done.

http://codereview.chromium.org/6823012/diff/1/pkcs11_init.cc
File pkcs11_init.cc (right):

http://codereview.chromium.org/6823012/diff/1/pkcs11_init.cc#newcode1
pkcs11_init.cc:1: // Copyright (c) 2009-2010 The Chromium OS Authors. All rights
reserved.
On 2011/04/08 20:21:45, Greg Spencer (Chromium) wrote:
> Should just be "2011"

Done.

http://codereview.chromium.org/6823012/diff/1/pkcs11_init.cc#newcode22
pkcs11_init.cc:22: const CK_CHAR kDefaultOpencryptokiSoPin[] = "87654321";
On 2011/04/08 20:21:45, Greg Spencer (Chromium) wrote:
> What are these "Opencryptoki" PINs used for, and why are they different from
the
> "Default" PINs?
> 
> In fact, except for the three things used in GetTpmTokenInfo, I don't see why
> any of these are here...

So this file is a stripped down version of one that gauravsh is working on from
fes.  I removed most functions but left these thinking it would be easier to
merge for gauravsh once this is landed.  But I've removed them to keep this
simple (sorry Gaurav!)  To your original question, this is the SO that
opencryptoki initializes the TPM token to by default.  We reset it to 0s.

http://codereview.chromium.org/6823012/diff/1/pkcs11_init.h
File pkcs11_init.h (right):

http://codereview.chromium.org/6823012/diff/1/pkcs11_init.h#newcode1
pkcs11_init.h:1: // Copyright (c) 2009-2010 The Chromium OS Authors. All rights
reserved.
On 2011/04/08 20:21:45, Greg Spencer (Chromium) wrote:
> Should just be "2011"

Done.

http://codereview.chromium.org/6823012/diff/1/service.cc
File service.cc (right):

http://codereview.chromium.org/6823012/diff/1/service.cc#newcode1
service.cc:1: // Copyright (c) 2009 The Chromium OS Authors. All rights
reserved.
On 2011/04/08 20:21:45, Greg Spencer (Chromium) wrote:
> Update copyright

Done.

http://codereview.chromium.org/6823012/diff/1/service.cc#newcode579
service.cc:579: gchar** OUT_so_pin,
I'm now removing the SO pin from sending after discovering it's neither
necessary nor prudent to be passed around.

http://codereview.chromium.org/6823012/diff/1/service.h
File service.h (right):

http://codereview.chromium.org/6823012/diff/1/service.h#newcode1
service.h:1: // Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
On 2011/04/08 20:21:45, Greg Spencer (Chromium) wrote:
> Update Copyright.

Done.

[gauravsh, 2011-04-08 21:37:35]

lgtm (once you push this, let me know - I will rebase my local copy then.)

http://codereview.chromium.org/6823012/diff/1/cryptohome.xml
File cryptohome.xml (right):

http://codereview.chromium.org/6823012/diff/1/cryptohome.xml#newcode109
cryptohome.xml:109: <arg type="s" name="so_pin" direction="out" />
update testing instructions in the issue description since you removed this.

http://codereview.chromium.org/6823012/diff/4002/service.cc
File service.cc (right):

http://codereview.chromium.org/6823012/diff/4002/service.cc#newcode84
service.cc:84: default_pkcs11_init_(new Pkcs11Init()),
pkcs11_init_ is just a helper pointer to avoid saying default_pkcs11_init.get()
each time you need to use Pkcs11Init?

http://codereview.chromium.org/6823012/diff/4002/service.h
File service.h (right):

http://codereview.chromium.org/6823012/diff/4002/service.h#newcode152
service.h:152: // Returns the label of the TPM token along with its SO and user
PINs.
update comment - you only send the user PINs now.

[Greg Spencer (Chromium), 2011-04-08 21:46:51]

LGTM

[kmixter1, 2011-04-08 21:56:39]

pushing...

I also updated Pkcs11IsReady to be Pkcs11IsTpmTokenReady to be more descriptive.
 Now adding these functions to cros/chromeos_cryptohome.h....

http://codereview.chromium.org/6823012/diff/1/cryptohome.xml
File cryptohome.xml (right):

http://codereview.chromium.org/6823012/diff/1/cryptohome.xml#newcode109
cryptohome.xml:109: <arg type="s" name="so_pin" direction="out" />
On 2011/04/08 21:37:35, gauravsh wrote:
> update testing instructions in the issue description since you removed this.
Done.

http://codereview.chromium.org/6823012/diff/4002/service.cc
File service.cc (right):

http://codereview.chromium.org/6823012/diff/4002/service.cc#newcode84
service.cc:84: default_pkcs11_init_(new Pkcs11Init()),
On 2011/04/08 21:37:35, gauravsh wrote:
> pkcs11_init_ is just a helper pointer to avoid saying
default_pkcs11_init.get()
> each time you need to use Pkcs11Init? 

Just mimicking tpm_init_ here.  I suspect Fes/Will's intention was to make it
easy to gmock out these via dependency injection, but no one is doing that in
either case yet.

http://codereview.chromium.org/6823012/diff/4002/service.h
File service.h (right):

http://codereview.chromium.org/6823012/diff/4002/service.h#newcode152
service.h:152: // Returns the label of the TPM token along with its SO and user
PINs.
On 2011/04/08 21:37:35, gauravsh wrote:
> update comment - you only send the user PINs now.

Done.