Index: net/base/cert_database.h |
diff --git a/net/base/cert_database.h b/net/base/cert_database.h |
index 7915cc60570b1aadc41894fadd95384c42f365ff..13c97b2e756b4daf41a4c8a3d4a4d997ba765abe 100644 |
--- a/net/base/cert_database.h |
+++ b/net/base/cert_database.h |
@@ -16,6 +16,8 @@ |
namespace net { |
+class PK11Slot; |
+typedef std::vector<scoped_refptr<PK11Slot> > PK11SlotList; |
class X509Certificate; |
typedef std::vector<scoped_refptr<X509Certificate> > CertificateList; |
@@ -72,10 +74,16 @@ class CertDatabase { |
// 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 => ListTokensForPKCS12Imp
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|. |