cryptohome: Ensure cryptohome key during SetupTpm
Fix a regression that cryptohome key is not loaded when SetupTpm
has been invoked with load_key=false because SetupTpm marks Tpm as
initialized and skips cryptohome key load when it is called
again with load_key=true.
BUG=chromium:606033
TEST=unittest, manual
Change-Id: I8f9e2ecd4109640e0a0cb1deb6d42b09380dd3a9
Reviewed-on: https://chromium-review.googlesource.com/340914
Commit-Ready: Xiyuan Xia <xiyuan@chromium.org>
Tested-by: Xiyuan Xia <xiyuan@chromium.org>
Reviewed-by: Darren Krahn <dkrahn@chromium.org>
(cherry picked from commit 79ea1f054d3909d27c3d7cb23b7b4bdac5583236)
Reviewed-on: https://chromium-review.googlesource.com/341961
Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
Commit-Queue: Xiyuan Xia <xiyuan@chromium.org>
2 files changed
