diff -r 000000000000 -r 6474c204b198 security/manager/ssl/src/nsNSSCertCache.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/security/manager/ssl/src/nsNSSCertCache.cpp	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,104 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsNSSCertCache.h"
+#include "nsNSSCertificate.h"
+#include "cert.h"
+#include "nsCOMPtr.h"
+#include "nsIInterfaceRequestor.h"
+#include "nsNSSHelper.h"
+
+using namespace mozilla;
+
+NS_IMPL_ISUPPORTS(nsNSSCertCache, nsINSSCertCache)
+
+nsNSSCertCache::nsNSSCertCache()
+:mutex("nsNSSCertCache.mutex"), mCertList(nullptr)
+{
+}
+
+nsNSSCertCache::~nsNSSCertCache()
+{
+  nsNSSShutDownPreventionLock locker;
+  if (isAlreadyShutDown()) {
+    return;
+  }
+  destructorSafeDestroyNSSReference();
+  shutdown(calledFromObject);
+}
+
+void nsNSSCertCache::virtualDestroyNSSReference()
+{
+  destructorSafeDestroyNSSReference();
+}
+
+void nsNSSCertCache::destructorSafeDestroyNSSReference()
+{
+}
+
+NS_IMETHODIMP
+nsNSSCertCache::CacheAllCerts()
+{
+  nsNSSShutDownPreventionLock locker;
+  if (isAlreadyShutDown())
+    return NS_ERROR_NOT_AVAILABLE;
+
+  nsCOMPtr<nsIInterfaceRequestor> cxt = new PipUIContext();
+  
+  mozilla::pkix::ScopedCERTCertList newList(
+    PK11_ListCerts(PK11CertListUnique, cxt));
+
+  if (newList) {
+    MutexAutoLock lock(mutex);
+    mCertList = new nsNSSCertList(newList, locker);
+  }
+  
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsNSSCertCache::CacheCertList(nsIX509CertList *list)
+{
+  nsNSSShutDownPreventionLock locker;
+  if (isAlreadyShutDown())
+    return NS_ERROR_NOT_AVAILABLE;
+
+  {
+    MutexAutoLock lock(mutex);
+    mCertList = list;
+    //NS_ADDREF(mCertList);
+  }
+  
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsNSSCertCache::GetX509CachedCerts(nsIX509CertList **list)
+{
+  nsNSSShutDownPreventionLock locker;
+  if (isAlreadyShutDown())
+    return NS_ERROR_NOT_AVAILABLE;
+
+  {
+    MutexAutoLock lock(mutex);
+    if (!mCertList) {
+      return NS_ERROR_NOT_AVAILABLE;
+    }
+    *list = mCertList;
+    NS_ADDREF(*list);
+  }
+  
+  return NS_OK;
+}
+
+
+
+void* nsNSSCertCache::GetCachedCerts()
+{
+  if (isAlreadyShutDown())
+    return nullptr;
+
+  MutexAutoLock lock(mutex);
+  return mCertList->GetRawCertList();
+}