| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "net/base/nss_cert_database.h" | 5 #include "net/cert/nss_cert_database.h" |
| 6 | 6 |
| 7 #include <cert.h> | 7 #include <cert.h> |
| 8 #include <certdb.h> | 8 #include <certdb.h> |
| 9 #include <keyhi.h> | 9 #include <keyhi.h> |
| 10 #include <pk11pub.h> | 10 #include <pk11pub.h> |
| 11 #include <secmod.h> | 11 #include <secmod.h> |
| 12 | 12 |
| 13 #include "base/logging.h" | 13 #include "base/logging.h" |
| 14 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
| 15 #include "base/memory/singleton.h" | 15 #include "base/memory/singleton.h" |
| 16 #include "base/observer_list_threadsafe.h" | 16 #include "base/observer_list_threadsafe.h" |
| 17 #include "crypto/nss_util.h" | 17 #include "crypto/nss_util.h" |
| 18 #include "crypto/nss_util_internal.h" | 18 #include "crypto/nss_util_internal.h" |
| 19 #include "net/base/cert_database.h" | |
| 20 #include "net/base/crypto_module.h" | 19 #include "net/base/crypto_module.h" |
| 21 #include "net/base/net_errors.h" | 20 #include "net/base/net_errors.h" |
| 22 #include "net/base/x509_certificate.h" | 21 #include "net/cert/cert_database.h" |
| 22 #include "net/cert/x509_certificate.h" |
| 23 #include "net/third_party/mozilla_security_manager/nsNSSCertificateDB.h" | 23 #include "net/third_party/mozilla_security_manager/nsNSSCertificateDB.h" |
| 24 #include "net/third_party/mozilla_security_manager/nsPKCS12Blob.h" | 24 #include "net/third_party/mozilla_security_manager/nsPKCS12Blob.h" |
| 25 | 25 |
| 26 // In NSS 3.13, CERTDB_VALID_PEER was renamed CERTDB_TERMINAL_RECORD. So we use | 26 // In NSS 3.13, CERTDB_VALID_PEER was renamed CERTDB_TERMINAL_RECORD. So we use |
| 27 // the new name of the macro. | 27 // the new name of the macro. |
| 28 #if !defined(CERTDB_TERMINAL_RECORD) | 28 #if !defined(CERTDB_TERMINAL_RECORD) |
| 29 #define CERTDB_TERMINAL_RECORD CERTDB_VALID_PEER | 29 #define CERTDB_TERMINAL_RECORD CERTDB_VALID_PEER |
| 30 #endif | 30 #endif |
| 31 | 31 |
| 32 // PSM = Mozilla's Personal Security Manager. | 32 // PSM = Mozilla's Personal Security Manager. |
| (...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 335 observer_list_->Notify(&Observer::OnCertRemoved, make_scoped_refptr(cert)); | 335 observer_list_->Notify(&Observer::OnCertRemoved, make_scoped_refptr(cert)); |
| 336 } | 336 } |
| 337 | 337 |
| 338 void NSSCertDatabase::NotifyObserversOfCertTrustChanged( | 338 void NSSCertDatabase::NotifyObserversOfCertTrustChanged( |
| 339 const X509Certificate* cert) { | 339 const X509Certificate* cert) { |
| 340 observer_list_->Notify( | 340 observer_list_->Notify( |
| 341 &Observer::OnCertTrustChanged, make_scoped_refptr(cert)); | 341 &Observer::OnCertTrustChanged, make_scoped_refptr(cert)); |
| 342 } | 342 } |
| 343 | 343 |
| 344 } // namespace net | 344 } // namespace net |
| OLD | NEW |