Revert 139719 - Fix imported server certs being distrusted in NSS 3.13.

Reverting as it seemed to break net_unittests on Linux(dbg)(shared).

Add support for intentionally distrusting certs.  (Not exposed in the UI yet.)

BUG=116411
TEST=CertDatabaseNSSTest


Review URL: https://chromiumcodereview.appspot.com/9940001

TBR=mattm@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10440110

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139725 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 63 insertions, 1 deletions

diff --git a/net/base/cert_database_openssl.cc b/net/base/cert_database_openssl.cc
index c5f86d4..82f7fd8 100644
--- a/net/base/cert_database_openssl.cc
+++ b/net/base/cert_database_openssl.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -36,4 +36,66 @@ int CertDatabase::AddUserCert(X509Certificate* cert) {
   return ERR_NOT_IMPLEMENTED;
 }
 
+void CertDatabase::ListCerts(CertificateList* certs) {
+  // TODO(bulach): implement me.
+  NOTIMPLEMENTED();
+}
+
+CryptoModule* CertDatabase::GetPublicModule() const {
+  // TODO(bulach): implement me.
+  NOTIMPLEMENTED();
+  return NULL;
+}
+
+CryptoModule* CertDatabase::GetPrivateModule() const {
+  // TODO(bulach): implement me.
+  NOTIMPLEMENTED();
+  return NULL;
+}
+
+void CertDatabase::ListModules(CryptoModuleList* modules, bool need_rw) const {
+  // TODO(bulach): implement me.
+  NOTIMPLEMENTED();
+  modules->clear();
+}
+
+int CertDatabase::ImportFromPKCS12(CryptoModule* module,
+                                   const std::string& data,
+                                   const string16& password,
+                                   bool is_extractable,
+                                   CertificateList* imported_certs) {
+  // TODO(bulach): implement me.
+  NOTIMPLEMENTED();
+  return ERR_NOT_IMPLEMENTED;
+}
+
+int CertDatabase::ExportToPKCS12(const CertificateList& certs,
+                                 const string16& password,
+                                 std::string* output) const {
+  // TODO(bulach): implement me.
+  NOTIMPLEMENTED();
+  return 0;
+}
+
+bool CertDatabase::DeleteCertAndKey(const X509Certificate* cert) {
+  // TODO(bulach): implement me.
+  NOTIMPLEMENTED();
+  return false;
+}
+
+CertDatabase::TrustBits CertDatabase::GetCertTrust(const X509Certificate* cert,
+                                                   CertType type) const {
+  // TODO(bulach): implement me.
+  NOTIMPLEMENTED();
+  return 0;
+}
+
+bool CertDatabase::SetCertTrust(const X509Certificate* cert,
+                                CertType type,
+                                TrustBits trust_bits) {
+  // TODO(bulach): implement me.
+  NOTIMPLEMENTED();
+  return false;
+}
+
 }  // namespace net