Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1131)

Unified Diff: net/base/test_root_certs_nss.cc

Issue 13006020: net: extract net/cert out of net/base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/base/test_root_certs_mac.cc ('k') | net/base/test_root_certs_openssl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/test_root_certs_nss.cc
diff --git a/net/base/test_root_certs_nss.cc b/net/base/test_root_certs_nss.cc
deleted file mode 100644
index 039b790c2e36c7f8156bd04a1e8e7b40b3b799b2..0000000000000000000000000000000000000000
--- a/net/base/test_root_certs_nss.cc
+++ /dev/null
@@ -1,125 +0,0 @@
-// 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.
-
-#include "net/base/test_root_certs.h"
-
-#include <cert.h>
-
-#include "base/logging.h"
-#include "base/stl_util.h"
-#include "crypto/nss_util.h"
-#include "net/base/x509_certificate.h"
-
-#if defined(OS_IOS)
-#include "net/base/x509_util_ios.h"
-#endif
-
-namespace net {
-
-// TrustEntry is used to store the original CERTCertificate and CERTCertTrust
-// for a certificate whose trust status has been changed by the
-// TestRootCerts.
-class TestRootCerts::TrustEntry {
- public:
- // Creates a new TrustEntry by incrementing the reference to |certificate|
- // and copying |trust|.
- TrustEntry(CERTCertificate* certificate, const CERTCertTrust& trust);
- ~TrustEntry();
-
- CERTCertificate* certificate() const { return certificate_; }
- const CERTCertTrust& trust() const { return trust_; }
-
- private:
- // The temporary root certificate.
- CERTCertificate* certificate_;
-
- // The original trust settings, before |certificate_| was manipulated to
- // be a temporarily trusted root.
- CERTCertTrust trust_;
-
- DISALLOW_COPY_AND_ASSIGN(TrustEntry);
-};
-
-TestRootCerts::TrustEntry::TrustEntry(CERTCertificate* certificate,
- const CERTCertTrust& trust)
- : certificate_(CERT_DupCertificate(certificate)),
- trust_(trust) {
-}
-
-TestRootCerts::TrustEntry::~TrustEntry() {
- CERT_DestroyCertificate(certificate_);
-}
-
-bool TestRootCerts::Add(X509Certificate* certificate) {
-#if defined(OS_IOS)
- x509_util_ios::NSSCertificate nss_certificate(certificate->os_cert_handle());
- CERTCertificate* cert_handle = nss_certificate.cert_handle();
-#else
- CERTCertificate* cert_handle = certificate->os_cert_handle();
-#endif
- // Preserve the original trust bits so that they can be restored when
- // the certificate is removed.
- CERTCertTrust original_trust;
- SECStatus rv = CERT_GetCertTrust(cert_handle, &original_trust);
- if (rv != SECSuccess) {
- // CERT_GetCertTrust will fail if the certificate does not have any
- // particular trust settings associated with it, and attempts to use
- // |original_trust| later to restore the original trust settings will not
- // cause the trust settings to be revoked. If the certificate has no
- // particular trust settings associated with it, mark the certificate as
- // a valid CA certificate with no specific trust.
- rv = CERT_DecodeTrustString(&original_trust, "c,c,c");
- }
-
- // Change the trust bits to unconditionally trust this certificate.
- CERTCertTrust new_trust;
- rv = CERT_DecodeTrustString(&new_trust, "TCu,Cu,Tu");
- if (rv != SECSuccess) {
- LOG(ERROR) << "Cannot decode certificate trust string.";
- return false;
- }
-
- rv = CERT_ChangeCertTrust(CERT_GetDefaultCertDB(), cert_handle, &new_trust);
- if (rv != SECSuccess) {
- LOG(ERROR) << "Cannot change certificate trust.";
- return false;
- }
-
- trust_cache_.push_back(new TrustEntry(cert_handle, original_trust));
- return true;
-}
-
-void TestRootCerts::Clear() {
- // Restore the certificate trusts to what they were originally, before
- // Add() was called. Work from the rear first, since if a certificate was
- // added twice, the second entry's original trust status will be that of
- // the first entry, while the first entry contains the desired resultant
- // status.
- for (std::list<TrustEntry*>::reverse_iterator it = trust_cache_.rbegin();
- it != trust_cache_.rend(); ++it) {
- CERTCertTrust original_trust = (*it)->trust();
- SECStatus rv = CERT_ChangeCertTrust(CERT_GetDefaultCertDB(),
- (*it)->certificate(),
- &original_trust);
- // DCHECK(), rather than LOG(), as a failure to restore the original
- // trust can cause flake or hard-to-trace errors in any unit tests that
- // occur after Clear() has been called.
- DCHECK_EQ(SECSuccess, rv) << "Cannot restore certificate trust.";
- }
- STLDeleteElements(&trust_cache_);
-}
-
-bool TestRootCerts::IsEmpty() const {
- return trust_cache_.empty();
-}
-
-TestRootCerts::~TestRootCerts() {
- Clear();
-}
-
-void TestRootCerts::Init() {
- crypto::EnsureNSSInit();
-}
-
-} // namespace net
« no previous file with comments | « net/base/test_root_certs_mac.cc ('k') | net/base/test_root_certs_openssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698