NSS: PKCS 11 password prompt.

net/base/cert_database.h

 // Copyright (c) 2010 The Chromium 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 NET_BASE_CERT_DATABASE_H_
 #define NET_BASE_CERT_DATABASE_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/string16.h"
 #include "base/ref_counted.h"
 #include "net/base/cert_type.h"
 
 namespace net {
 
+class PK11Slot;
+typedef std::vector<scoped_refptr<PK11Slot> > PK11SlotList;
 class X509Certificate;
 typedef std::vector<scoped_refptr<X509Certificate> > CertificateList;
 
 
 // This class provides functions to manipulate the local
 // certificate store.
 
 // TODO(gauravsh): This class could be augmented with methods
 // for all operations that manipulate the underlying system
 // certificate store.
@@ skipping 36 matching lines @@
   // Store user (client) certificate. Assumes CheckUserCert has already passed.
   // Returns OK, or ERR_ADD_USER_CERT_FAILED if there was a problem saving to
   // the platform cert database, or possibly other network error codes.
   int AddUserCert(X509Certificate* cert);
 
 #if defined(USE_NSS) || defined(USE_OPENSSL)
   // Get a list of unique certificates in the certificate database.  (One
   // instance of all certificates.)
   void ListCerts(CertificateList* certs);
 
+  // Get a list of slots containing tokens which can be used for PKCS #12
+  // import.
+  void ListTokensForPKCS12(PK11SlotList* slots) const;

[wtc, 2010/12/15 20:54:36]

Nit: ListTokensForPKCS12 => ListTokensForPKCS12Import ?

[mattm, 2011/01/12 01:22:07]

Done.

+
   // Import certificates and private keys from PKCS #12 blob.

[wtc, 2010/12/15 20:54:36]

Add "into the slot".

[mattm, 2011/01/12 01:22:07]

Done.

   // Returns OK or a network error code such as ERR_PKCS12_IMPORT_BAD_PASSWORD
   // or ERR_PKCS12_IMPORT_ERROR.
-  int ImportFromPKCS12(const std::string& data, const string16& password);
+  int ImportFromPKCS12(net::PK11Slot* slot,
+                       const std::string& data,
+                       const string16& password);
 
   // Export the given certificates and private keys into a PKCS #12 blob,
   // storing into |output|.
   // Returns the number of certificates successfully exported.
   int ExportToPKCS12(const CertificateList& certs, const string16& password,
                      std::string* output) const;
 
   // Uses similar logic to nsNSSCertificateDB::handleCACertDownload to find the
   // root.  Assumes the list is an ordered hierarchy with the root being either
   // the first or last element.
@@ skipping 40 matching lines @@
   bool IsReadOnly(const X509Certificate* cert) const;
 #endif
 
  private:
   DISALLOW_COPY_AND_ASSIGN(CertDatabase);
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_CERT_DATABASE_H_