Eliminate stale pkcs11 certificate handler implementations.

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 <syslog.h>
 
 // syslog.h and base/logging.h both try to #define LOG_INFO and LOG_WARNING.
 // We need to #undef at least these two before including base/logging.h.  The
 // others are included to be consistent.
@@ skipping 28 matching lines @@
 // User Name
 static const char *kUsername = "username";
 
 // Policy files
 static const char *kManifest = "manifest";
 static const char *kPolicy =   "policy";
 static const char *kUtility =  "utility";
 
 // Specify how to setup the pkcs11 interface
 static const char *kPkcs11 = "pkcs11";
-static const char *kOpenSSLConf = "openssl-conf";
 
 // Root CA for HTTPS requests.
 static const char *kRootCAFile = "root-ca-file";
 
 // If specified, then self-signed server certs are ok for HTTPS
 static const char *kAllowSelfSigned = "allow-self-signed";
 
 // If specified, then file operations are allowed (e.g. for testing)
 static const char *kAllowFileIO = "allow-file-io";
 
@@ skipping 64 matching lines @@
     logging::SetLogMessageHandler(handle_message);
   }
 
   LOG(INFO) << "Starting entd";
 
   std::string base_extension_path =
       cl->GetSwitchValueASCII(switches::kExtensionPath);
   std::string username = cl->GetSwitchValueASCII(switches::kUsername);
   std::string root_ca_file = cl->GetSwitchValueASCII(switches::kRootCAFile);
   std::string pkcs11_mode = cl->GetSwitchValueASCII(switches::kPkcs11);
-  std::string openssl_conf = cl->GetSwitchValueASCII(switches::kOpenSSLConf);
 
   // Get file paths from a valid policy extension if it exists
   std::string extension_path;
   bool valid_policy = false;
   if (!base_extension_path.empty()) {
     valid_policy = entd::extensions::FindValidPolicy(base_extension_path,
                                                      &extension_path);
   }
 
   if (valid_policy) {
@@ skipping 41 matching lines @@
 
   if (!manifest.empty())
     d.SetManifestFile(manifest);
 
   if (!policy.empty())
     d.SetPolicyFile(policy);
 
   if (!pkcs11_mode.empty())
     d.SetPkcs11Mode(pkcs11_mode);
 
-  if (!openssl_conf.empty())
-    d.SetPkcs11OpenSSLConfig(openssl_conf);
-
   uint32_t rv = d.Run();
   LOG(INFO) << "Exiting entd with code: " << rv;
   return rv;
 }