Index: net/base/cert_database_nss.cc |
diff --git a/net/base/cert_database_nss.cc b/net/base/cert_database_nss.cc |
deleted file mode 100644 |
index e0f4ca6850133487d0a46bae64427381af238519..0000000000000000000000000000000000000000 |
--- a/net/base/cert_database_nss.cc |
+++ /dev/null |
@@ -1,104 +0,0 @@ |
-// Copyright (c) 2012 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. |
- |
-#include "net/base/cert_database.h" |
- |
-#include <cert.h> |
-#include <pk11pub.h> |
-#include <secmod.h> |
- |
-#include "base/logging.h" |
-#include "base/observer_list_threadsafe.h" |
-#include "crypto/nss_util.h" |
-#include "net/base/net_errors.h" |
-#include "net/base/nss_cert_database.h" |
-#include "net/base/x509_certificate.h" |
- |
-namespace net { |
- |
-// Helper that observes events from the NSSCertDatabase and forwards them to |
-// the given CertDatabase. |
-class CertDatabase::Notifier : public NSSCertDatabase::Observer { |
- public: |
- explicit Notifier(CertDatabase* cert_db) : cert_db_(cert_db) { |
- NSSCertDatabase::GetInstance()->AddObserver(this); |
- } |
- |
- virtual ~Notifier() { |
- NSSCertDatabase::GetInstance()->RemoveObserver(this); |
- } |
- |
- // NSSCertDatabase::Observer implementation: |
- virtual void OnCertAdded(const X509Certificate* cert) OVERRIDE { |
- cert_db_->NotifyObserversOfCertAdded(cert); |
- } |
- |
- virtual void OnCertRemoved(const X509Certificate* cert) OVERRIDE { |
- cert_db_->NotifyObserversOfCertRemoved(cert); |
- } |
- |
- virtual void OnCertTrustChanged(const X509Certificate* cert) OVERRIDE { |
- cert_db_->NotifyObserversOfCertTrustChanged(cert); |
- } |
- |
- private: |
- CertDatabase* cert_db_; |
- |
- DISALLOW_COPY_AND_ASSIGN(Notifier); |
-}; |
- |
-CertDatabase::CertDatabase() |
- : observer_list_(new ObserverListThreadSafe<Observer>) { |
- // Observe NSSCertDatabase events and forward them to observers of |
- // CertDatabase. This also makes sure that NSS has been initialized. |
- notifier_.reset(new Notifier(this)); |
-} |
- |
-CertDatabase::~CertDatabase() {} |
- |
-int CertDatabase::CheckUserCert(X509Certificate* cert_obj) { |
- if (!cert_obj) |
- return ERR_CERT_INVALID; |
- if (cert_obj->HasExpired()) |
- return ERR_CERT_DATE_INVALID; |
- |
- // Check if the private key corresponding to the certificate exist |
- // We shouldn't accept any random client certificate sent by a CA. |
- |
- // Note: The NSS source documentation wrongly suggests that this |
- // also imports the certificate if the private key exists. This |
- // doesn't seem to be the case. |
- |
- CERTCertificate* cert = cert_obj->os_cert_handle(); |
- PK11SlotInfo* slot = PK11_KeyForCertExists(cert, NULL, NULL); |
- if (!slot) |
- return ERR_NO_PRIVATE_KEY_FOR_CERT; |
- |
- PK11_FreeSlot(slot); |
- |
- return OK; |
-} |
- |
-int CertDatabase::AddUserCert(X509Certificate* cert_obj) { |
- CERTCertificate* cert = cert_obj->os_cert_handle(); |
- PK11SlotInfo* slot = NULL; |
- |
- { |
- crypto::AutoNSSWriteLock lock; |
- slot = PK11_ImportCertForKey( |
- cert, |
- cert_obj->GetDefaultNickname(net::USER_CERT).c_str(), |
- NULL); |
- } |
- |
- if (!slot) { |
- LOG(ERROR) << "Couldn't import user certificate."; |
- return ERR_ADD_USER_CERT_FAILED; |
- } |
- PK11_FreeSlot(slot); |
- NotifyObserversOfCertAdded(cert_obj); |
- return OK; |
-} |
- |
-} // namespace net |