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

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

Issue 686883002: Add crypto/wincrypt_shim.h wrapper header to resolve BoringSSL conflicts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sleevi comments Created 6 years, 1 month 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 | « net/cert/sha256_legacy_support_win.cc ('k') | net/cert/test_root_certs_win.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/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
11 #include "net/base/net_export.h" 11 #include "net/base/net_export.h"
12 12
13 #if defined(USE_NSS) || defined(OS_IOS) 13 #if defined(USE_NSS) || defined(OS_IOS)
14 #include <list> 14 #include <list>
15 #elif defined(USE_OPENSSL_CERTS) && !defined(OS_ANDROID) 15 #elif defined(USE_OPENSSL_CERTS) && !defined(OS_ANDROID)
16 #include <vector> 16 #include <vector>
17 #elif defined(OS_WIN) 17 #elif defined(OS_WIN)
18 #include <windows.h> 18 #include <windows.h>
19 #include <wincrypt.h> 19 #include "crypto/wincrypt_shim.h"
20 #elif defined(OS_MACOSX) 20 #elif defined(OS_MACOSX)
21 #include <CoreFoundation/CFArray.h> 21 #include <CoreFoundation/CFArray.h>
22 #include <Security/SecTrust.h> 22 #include <Security/SecTrust.h>
23 #include "base/mac/scoped_cftyperef.h" 23 #include "base/mac/scoped_cftyperef.h"
24 #endif 24 #endif
25 25
26 #if defined(USE_NSS) 26 #if defined(USE_NSS)
27 typedef struct CERTCertificateStr CERTCertificate; 27 typedef struct CERTCertificateStr CERTCertificate;
28 #elif defined(USE_OPENSSL_CERTS) && !defined(OS_ANDROID) 28 #elif defined(USE_OPENSSL_CERTS) && !defined(OS_ANDROID)
29 typedef struct x509_st X509; 29 typedef struct x509_st X509;
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 140
141 private: 141 private:
142 scoped_refptr<X509Certificate> cert_; 142 scoped_refptr<X509Certificate> cert_;
143 143
144 DISALLOW_COPY_AND_ASSIGN(ScopedTestRoot); 144 DISALLOW_COPY_AND_ASSIGN(ScopedTestRoot);
145 }; 145 };
146 146
147 } // namespace net 147 } // namespace net
148 148
149 #endif // NET_CERT_TEST_ROOT_CERTS_H_ 149 #endif // NET_CERT_TEST_ROOT_CERTS_H_
OLDNEW
« no previous file with comments | « net/cert/sha256_legacy_support_win.cc ('k') | net/cert/test_root_certs_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698