Eliminate stale pkcs11 certificate handler implementations.

entd.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 "entd/entd.h"
 
 #include <stdio.h>
 
 #include <iostream>
 
@@ skipping 378 matching lines @@
   // Build the callbackServer object.
   callback_server_.reset(new CallbackServer(this));
   if (!callback_server_->Initialize()) {
     LOG(ERROR) << "Error initializing entd.callback_server";
     exit(1);
   }
   entd->Set(v8::String::NewSymbol("callbackServer"),
             callback_server_->obj(), v8::ReadOnly);
 
   // Build the pkcs11 object
-  bool res = false;
   pkcs11_.reset(new Pkcs11(NULL, NULL));
-  if (pkcs11_mode_ == "opencryptoki") {
-    res = pkcs11_->InitializeOpenCryptoki(pkcs11_config_filename_);
-  } else if (pkcs11_mode_ == "glaptop") {
-    res = pkcs11_->InitializeGLaptop();
-  } else if (pkcs11_mode_ == "openssl") {
-    res = pkcs11_->InitializeOpenSSL();
-  } else if (!pkcs11_mode_.empty()) {
-    LOG(ERROR) << "Unrecognized pkcs11 mode: " << pkcs11_mode_;
-  } else {
-    res = pkcs11_->Initialize();
+  bool res = pkcs11_->Initialize();
+  if (pkcs11_mode_ == "openssl") {
+    res = res && pkcs11_->SetOpenSSLHandlers();
+  } else if (pkcs11_mode_ != "test") {
+    res = res && pkcs11_->SetOpenCryptokiHandlers();
   }
   if (!res) {
     LOG(ERROR) << "Error initializing entd.pkcs11";
     exit(1);
   }
+
   entd->Set(v8::String::New("pkcs11"),
             pkcs11_->obj(), v8::ReadOnly);
 
   return handle_scope.Close(entd);
 }
 
 bool Entd::StartScriptingEnvironment() {
   v8::HandleScope handle_scope;
 
   // Create the global object.
@@ skipping 444 matching lines @@
   *result = script->Run();
   if (!result || result->IsEmpty()) {
     utils::ReportV8Exception(&try_catch);
     return false;
   }
 
   return true;
 }
 
 }  // namespace entd