entd: move opencryptoki initialization out of entd

main.cc

 // Copyright (c) 2010 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.
 
 #include <stdio.h>
 #include <iostream>
 #include <string>
 
 #include <base/command_line.h>
 #include <base/file_util.h>
 #include <chromeos/syslog_logging.h>
 
 #include "entd/entd.h"
 #include "entd/extensions.h"
 #include "entd/callback_server.h"
 #include "entd/http.h"
 #include "entd/pkcs11.h"
+#include "entd/tpm.h"
 #include "entd/utils.h"
 
 namespace switches {
 // Path to search for extensions; can contain ~ or env variables (e.g. ${HOME})
 static const char *kExtensionPath = "extension-path";
 
 // User Name
 static const char *kUsername = "username";
 
 // Policy files
@@ skipping 21 matching lines @@
 
 // Syslogging is enabled by default if stdout is not a tty.  These flags can
 // be used to override the default logic.
 static const char *kEnableSyslog = "enable-syslog";
 static const char *kDisableSyslog = "disable-syslog";
 
 static const char *kLibcrosLocation = "libcros-location";
 
 static const char *kCallbackOrigin = "callback-origin";
 
+// TODO(crosbug.com/14277): Remove option and assume it is true.
+static const char *kCryptohomeInitPkcs11 =
+    "cryptohome-init-pkcs11";
+
 }  // namespace switches
 
 // Return values:
 //   0: Entd completed successfully and should not be restarted.
 //   1: Entd encountered a failure, but will probably fail again if restarted,
 //      so please don't.
 //   2: Entd has NOT encountered a failure, but would like to be restarted.
 //  >2: Entd has encountered a failure, restarting may help.
 //
 // So, exit with a zero or one means leave it down, otherwise restart.
@@ skipping 61 matching lines @@
     LOG(INFO) << "Allowing self-signed certs.";
     entd::Http::allow_self_signed_certs = true;
   }
 
   if (cl->HasSwitch(switches::kLibcrosLocation)) {
     entd::Entd::libcros_location = cl->GetSwitchValueASCII(
         switches::kLibcrosLocation);
     LOG(INFO) << "Setting libcros location: " << entd::Entd::libcros_location;
   }
 
+  if (cl->HasSwitch(switches::kCryptohomeInitPkcs11)) {
+    LOG(INFO) << "Expecting cryptohome to initialize the TPM token";
+    entd::Tpm::cryptohome_init_pkcs11 = true;
+  }
+
   if (cl->HasSwitch(switches::kAllowFileIO)) {
     LOG(INFO) << "Allowing File IO.";
     entd::Entd::allow_file_io = true;
   }
 
   if (!root_ca_file.empty()) {
     LOG(INFO) << "Setting root CA file: " << root_ca_file;
     entd::Http::root_ca_file = root_ca_file;
   }
 
@@ skipping 26 matching lines @@
   if (!manifest.empty())
     d.SetManifestFile(manifest);
 
   if (!policy.empty())
     d.SetPolicyFile(policy);
 
   uint32_t rv = d.Run();
   LOG(INFO) << "Exiting entd with code: " << rv;
   return rv;
 }