Chromium Code Reviews| Index: net/third_party/mozilla_security_manager/nsPKCS12Blob.h |
| diff --git a/net/third_party/mozilla_security_manager/nsPKCS12Blob.h b/net/third_party/mozilla_security_manager/nsPKCS12Blob.h |
| index 95b8d465d660d79437d80b3cb7cd098eff6b8bb1..88fac7ad8064a9927ef22ac54d3dec0a25e49fe2 100644 |
| --- a/net/third_party/mozilla_security_manager/nsPKCS12Blob.h |
| +++ b/net/third_party/mozilla_security_manager/nsPKCS12Blob.h |
| @@ -45,6 +45,7 @@ |
| #include "base/ref_counted.h" |
| typedef struct CERTCertificateStr CERTCertificate; |
| +typedef struct PK11SlotInfoStr PK11SlotInfo; |
| namespace net { |
| class X509Certificate; |
| typedef std::vector<scoped_refptr<X509Certificate> > CertificateList; |
| @@ -57,7 +58,8 @@ void EnsurePKCS12Init(); |
| // Import certificate from PKCS#12 blob. |
|
wtc
2010/12/15 20:54:36
Nit: add "into the slot".
mattm
2011/01/12 01:22:07
Done.
|
| // Returns a net error code. |
| -int nsPKCS12Blob_Import(const char* pkcs12_data, |
| +int nsPKCS12Blob_Import(PK11SlotInfo* slot, |
| + const char* pkcs12_data, |
| size_t pkcs12_len, |
| const string16& password); |