Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(605)

Unified Diff: net/third_party/mozilla_security_manager/nsNSSCertificateDB.h

Issue 18121007: *WIP* Store NSS slots per profile. Move keygen to chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: more refactoring Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
« no previous file with comments | « net/ssl/client_cert_store_impl_nss.cc ('k') | net/third_party/mozilla_security_manager/nsNSSCertificateDB.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698