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

Side by Side Diff: net/cert/test_root_certs.h

Issue 2732913006: Remove unnecessary iOS ifdefs in NSS files. (Closed)
Patch Set: . Created 3 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 unified diff | Download patch
« no previous file with comments | « no previous file | net/cert/test_root_certs_nss.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 #ifndef NET_CERT_TEST_ROOT_CERTS_H_ 5 #ifndef NET_CERT_TEST_ROOT_CERTS_H_
6 #define NET_CERT_TEST_ROOT_CERTS_H_ 6 #define NET_CERT_TEST_ROOT_CERTS_H_
7 7
8 #include "base/lazy_instance.h" 8 #include "base/lazy_instance.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 60
61 // Clears the trusted status of any certificates that were previously 61 // Clears the trusted status of any certificates that were previously
62 // marked trusted via Add(). 62 // marked trusted via Add().
63 void Clear(); 63 void Clear();
64 64
65 // Returns true if there are no certificates that have been marked trusted. 65 // Returns true if there are no certificates that have been marked trusted.
66 bool IsEmpty() const; 66 bool IsEmpty() const;
67 67
68 #if defined(USE_NSS_CERTS) 68 #if defined(USE_NSS_CERTS)
69 bool Contains(CERTCertificate* cert) const; 69 bool Contains(CERTCertificate* cert) const;
70 #elif defined(OS_MACOSX) && !defined(USE_NSS_CERTS) 70 #elif defined(OS_MACOSX)
71 CFArrayRef temporary_roots() const { return temporary_roots_; } 71 CFArrayRef temporary_roots() const { return temporary_roots_; }
72 72
73 // Modifies the root certificates of |trust_ref| to include the 73 // Modifies the root certificates of |trust_ref| to include the
74 // certificates stored in |temporary_roots_|. If IsEmpty() is true, this 74 // certificates stored in |temporary_roots_|. If IsEmpty() is true, this
75 // does not modify |trust_ref|. 75 // does not modify |trust_ref|.
76 OSStatus FixupSecTrustRef(SecTrustRef trust_ref) const; 76 OSStatus FixupSecTrustRef(SecTrustRef trust_ref) const;
77 77
78 // Configures whether or not the default/system root store should also 78 // Configures whether or not the default/system root store should also
79 // be trusted. By default, this is true, indicating that the TestRootCerts 79 // be trusted. By default, this is true, indicating that the TestRootCerts
80 // are used in addition to OS trust store. 80 // are used in addition to OS trust store.
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 166
167 private: 167 private:
168 scoped_refptr<X509Certificate> cert_; 168 scoped_refptr<X509Certificate> cert_;
169 169
170 DISALLOW_COPY_AND_ASSIGN(ScopedTestRoot); 170 DISALLOW_COPY_AND_ASSIGN(ScopedTestRoot);
171 }; 171 };
172 172
173 } // namespace net 173 } // namespace net
174 174
175 #endif // NET_CERT_TEST_ROOT_CERTS_H_ 175 #endif // NET_CERT_TEST_ROOT_CERTS_H_
OLDNEW
« no previous file with comments | « no previous file | net/cert/test_root_certs_nss.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698