Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / net / cert / nss_cert_database_chromeos.cc

diff --git a/src/net/cert/nss_cert_database_chromeos.cc b/src/net/cert/nss_cert_database_chromeos.cc
index 936287c..63d969c 100644 (file)
--- a/src/net/cert/nss_cert_database_chromeos.cc
+++ b/src/net/cert/nss_cert_database_chromeos.cc
@@ -7,6 +7,12 @@
 #include <cert.h>
 #include <pk11pub.h>
 
+#include <algorithm>
+
+#include "base/bind.h"
+#include "base/callback.h"
+#include "base/location.h"
+#include "base/task_runner.h"
 #include "net/base/crypto_module.h"
 #include "net/cert/x509_certificate.h"
 
@@ -15,35 +21,44 @@ namespace net {
 NSSCertDatabaseChromeOS::NSSCertDatabaseChromeOS(
     crypto::ScopedPK11Slot public_slot,
     crypto::ScopedPK11Slot private_slot)
-    : public_slot_(public_slot.Pass()),
-      private_slot_(private_slot.Pass()) {
-  profile_filter_.Init(GetPublicSlot(), GetPrivateSlot());
+    : NSSCertDatabase(public_slot.Pass(), private_slot.Pass()) {
+  // By default, don't use a system slot. Only if explicitly set by
+  // SetSystemSlot, the system slot will be used.
+  profile_filter_.Init(GetPublicSlot(),
+                       GetPrivateSlot(),
+                       crypto::ScopedPK11Slot() /* no system slot */);
 }
 
 NSSCertDatabaseChromeOS::~NSSCertDatabaseChromeOS() {}
 
-void NSSCertDatabaseChromeOS::ListCerts(CertificateList* certs) {
-  NSSCertDatabase::ListCerts(certs);
+void NSSCertDatabaseChromeOS::SetSystemSlot(
+    crypto::ScopedPK11Slot system_slot) {
+  system_slot_ = system_slot.Pass();
+  profile_filter_.Init(GetPublicSlot(), GetPrivateSlot(), GetSystemSlot());
+}
 
-  size_t pre_size = certs->size();
-  certs->erase(std::remove_if(
-                   certs->begin(),
-                   certs->end(),
-                   NSSProfileFilterChromeOS::CertNotAllowedForProfilePredicate(
-                       profile_filter_)),
-               certs->end());
-  DVLOG(1) << "filtered " << pre_size - certs->size() << " of " << pre_size
-           << " certs";
+void NSSCertDatabaseChromeOS::ListCertsSync(CertificateList* certs) {
+  ListCertsImpl(profile_filter_, certs);
 }
 
-crypto::ScopedPK11Slot NSSCertDatabaseChromeOS::GetPublicSlot() const {
-  return crypto::ScopedPK11Slot(
-      public_slot_ ? PK11_ReferenceSlot(public_slot_.get()) : NULL);
+void NSSCertDatabaseChromeOS::ListCerts(
+    const base::Callback<void(scoped_ptr<CertificateList> certs)>& callback) {
+  scoped_ptr<CertificateList> certs(new CertificateList());
+
+  // base::Pased will NULL out |certs|, so cache the underlying pointer here.
+  CertificateList* raw_certs = certs.get();
+  GetSlowTaskRunner()->PostTaskAndReply(
+      FROM_HERE,
+      base::Bind(&NSSCertDatabaseChromeOS::ListCertsImpl,
+                 profile_filter_,
+                 base::Unretained(raw_certs)),
+      base::Bind(callback, base::Passed(&certs)));
 }
 
-crypto::ScopedPK11Slot NSSCertDatabaseChromeOS::GetPrivateSlot() const {
-  return crypto::ScopedPK11Slot(
-      private_slot_ ? PK11_ReferenceSlot(private_slot_.get()) : NULL);
+crypto::ScopedPK11Slot NSSCertDatabaseChromeOS::GetSystemSlot() const {
+  if (system_slot_)
+    return crypto::ScopedPK11Slot(PK11_ReferenceSlot(system_slot_.get()));
+  return crypto::ScopedPK11Slot();
 }
 
 void NSSCertDatabaseChromeOS::ListModules(CryptoModuleList* modules,
@@ -62,4 +77,20 @@ void NSSCertDatabaseChromeOS::ListModules(CryptoModuleList* modules,
            << " modules";
 }
 
+void NSSCertDatabaseChromeOS::ListCertsImpl(
+    const NSSProfileFilterChromeOS& profile_filter,
+    CertificateList* certs) {
+  NSSCertDatabase::ListCertsImpl(crypto::ScopedPK11Slot(), certs);
+
+  size_t pre_size = certs->size();
+  certs->erase(std::remove_if(
+                   certs->begin(),
+                   certs->end(),
+                   NSSProfileFilterChromeOS::CertNotAllowedForProfilePredicate(
+                       profile_filter)),
+               certs->end());
+  DVLOG(1) << "filtered " << pre_size - certs->size() << " of " << pre_size
+           << " certs";
+}
+
 }  // namespace net