Eliminate stale pkcs11 certificate handler implementations.

pkcs11.h

 // 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.
 
 #ifndef ENTD_PKCS11_H_
 #define ENTD_PKCS11_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 66 matching lines @@
   Pkcs11SlotHandler* slot_handler_;
 };
 
 // Pkcs11 JavaScript Interface class.
 //
 // This class wraps a V8 singleton object to handle the PKCS11 interface.
 class Pkcs11 : public JSObjectWrapper<Pkcs11> {
  public:
   // The constructor takes two handlers:
   // * cert_handler builds CSRs and certificates.
+  //   - builds CSRs
+  //   - may generate a public/private key pair
+  //   - parses Certificates and extracts the subject
   // * slot_handler handles the interface with a pkcs11 device:
-  //   - generates public/private key pairs
-  //   - adds certificates
-  //   - retrieves a list of slot labels and the contents of a named slot.
+  //   - may generate public/private key pairs
+  //   - stores key pairs and certificates
+  //   - retrieves a list of existing token objects in a slot
   //
-  // If cert_handler is NULL, a Pkcs11CertificateHandlerLocalFile is built,
-  // with empty filenames (see below).
-  // If slot_handler is NULL, a Pkcs11SlotHandlerInMemory is built
-  // (see code).
+  // If cert_handler or slot_handler NULL,
+  // the class is initialized with the default handler (see code).
   Pkcs11(Pkcs11CertificateHandler* cert_handler,
          Pkcs11SlotHandler* slot_handler);
   virtual ~Pkcs11();
   virtual bool Initialize();
-  // Call this *instead of* Initialize() to use opencryptoki with openssl
-  bool InitializeOpenCryptoki(const std::string& engine);
-  // Call this *instead of* Initialize() to use openssl to generate keys
-  // and to store the private key in the tpm (like glaptop does)
-  bool InitializeGLaptop();
-  // Call this *instead of* Initialize() to use openssl without opencryptoki
-  bool InitializeOpenSSL();
-  // Call this *instead of* Initialize() to use local files
-  bool InitializeLocalFiles(const std::string& csr, const std::string& cert);
+  // Set the Certificate handler to use openssl to generate CSRs
+  bool SetOpenSSLHandlers();
+  // Set the Slot handler to use opencryptoki,
+  // and the Certificate handler to use openssl
+  bool SetOpenCryptokiHandlers();
 
   // Adds slot_object to "pkcs11.slots"
   bool AddJSSlotObject(const SlotObject* slot_object);
   bool RemoveJSSlotObject(const std::string& label);
 
   // JSObjectWrapper functions
   static const char* GetClassName() { return "pkcs11"; }
   static void SetTemplateBindings(
       v8::Handle<v8::ObjectTemplate> template_object);
 
@@ skipping 10 matching lines @@
   scoped_ptr<Pkcs11SlotHandler> slot_handler_;
 
   void SetupHandlers();
 
   DISALLOW_COPY_AND_ASSIGN(Pkcs11);
 };
 
 } // namespace entd
 
 #endif // ENTD_PKCS11_H_