| Index: net/third_party/mozilla_security_manager/nsNSSCertificateDB.h
|
| diff --git a/net/third_party/mozilla_security_manager/nsNSSCertificateDB.h b/net/third_party/mozilla_security_manager/nsNSSCertificateDB.h
|
| index aac991255f0d92d0410bb2d4d51fa502b813e21a..9b78ff2bf0c93e6cf44afda84d83ad7b5bde391c 100644
|
| --- a/net/third_party/mozilla_security_manager/nsNSSCertificateDB.h
|
| +++ b/net/third_party/mozilla_security_manager/nsNSSCertificateDB.h
|
| @@ -42,6 +42,7 @@
|
| #include <vector>
|
|
|
| #include "base/memory/ref_counted.h"
|
| +#include "crypto/scoped_nss_types.h"
|
| #include "net/cert/nss_cert_database.h"
|
|
|
| typedef struct CERTCertificateStr CERTCertificate;
|
| @@ -52,12 +53,14 @@ typedef std::vector<scoped_refptr<X509Certificate> > CertificateList;
|
|
|
| namespace mozilla_security_manager {
|
|
|
| -bool ImportCACerts(const net::CertificateList& certificates,
|
| +bool ImportCACerts(crypto::ScopedPK11Slot slot,
|
| + const net::CertificateList& certificates,
|
| net::X509Certificate* root,
|
| net::NSSCertDatabase::TrustBits trustBits,
|
| net::NSSCertDatabase::ImportCertFailureList* not_imported);
|
|
|
| bool ImportServerCert(
|
| + crypto::ScopedPK11Slot slot,
|
| const net::CertificateList& certificates,
|
| net::NSSCertDatabase::TrustBits trustBits,
|
| net::NSSCertDatabase::ImportCertFailureList* not_imported);
|
|
|