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

Side by Side Diff: net/cert/test_root_certs_nss.cc

Issue 137553004: NSS Cros multiprofile: trust roots added by a profile shouldn't apply to other profiles. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: handle additional trust roots, add TestRootCertsTest.Contains, remove instantiated certtests from c… Created 6 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/cert/test_root_certs.h" 5 #include "net/cert/test_root_certs.h"
6 6
7 #include <cert.h> 7 #include <cert.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/stl_util.h" 10 #include "base/stl_util.h"
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 // occur after Clear() has been called. 107 // occur after Clear() has been called.
108 DCHECK_EQ(SECSuccess, rv) << "Cannot restore certificate trust."; 108 DCHECK_EQ(SECSuccess, rv) << "Cannot restore certificate trust.";
109 } 109 }
110 STLDeleteElements(&trust_cache_); 110 STLDeleteElements(&trust_cache_);
111 } 111 }
112 112
113 bool TestRootCerts::IsEmpty() const { 113 bool TestRootCerts::IsEmpty() const {
114 return trust_cache_.empty(); 114 return trust_cache_.empty();
115 } 115 }
116 116
117 bool TestRootCerts::Contains(X509Certificate::OSCertHandle cert) const {
118 for (std::list<TrustEntry*>::const_iterator it = trust_cache_.begin();
119 it != trust_cache_.end();
Ryan Sleevi 2014/01/30 05:27:40 ++it on this line
mattm 2014/02/04 05:31:21 Done.
120 ++it) {
121 if (X509Certificate::IsSameOSCert(cert, (*it)->certificate()))
122 return true;
123 }
124 return false;
125 }
126
117 TestRootCerts::~TestRootCerts() { 127 TestRootCerts::~TestRootCerts() {
118 Clear(); 128 Clear();
119 } 129 }
120 130
121 void TestRootCerts::Init() { 131 void TestRootCerts::Init() {
122 crypto::EnsureNSSInit(); 132 crypto::EnsureNSSInit();
123 } 133 }
124 134
125 } // namespace net 135 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698