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

Side by Side Diff: net/cert/x509_certificate.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/x509_cert_types_win.cc ('k') | net/ssl/client_cert_store_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_X509_CERTIFICATE_H_ 5 #ifndef NET_CERT_X509_CERTIFICATE_H_
6 #define NET_CERT_X509_CERTIFICATE_H_ 6 #define NET_CERT_X509_CERTIFICATE_H_
7 7
8 #include <string.h> 8 #include <string.h>
9 9
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/gtest_prod_util.h" 13 #include "base/gtest_prod_util.h"
14 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
15 #include "base/strings/string_piece.h" 15 #include "base/strings/string_piece.h"
16 #include "base/time/time.h" 16 #include "base/time/time.h"
17 #include "net/base/net_export.h" 17 #include "net/base/net_export.h"
18 #include "net/cert/cert_type.h" 18 #include "net/cert/cert_type.h"
19 #include "net/cert/x509_cert_types.h" 19 #include "net/cert/x509_cert_types.h"
20 20
21 #if defined(OS_WIN) 21 #if defined(OS_WIN)
22 #include <windows.h> 22 #include <windows.h>
23 #include <wincrypt.h> 23 #include "crypto/wincrypt_shim.h"
24 #elif defined(OS_MACOSX) 24 #elif defined(OS_MACOSX)
25 #include <CoreFoundation/CFArray.h> 25 #include <CoreFoundation/CFArray.h>
26 #include <Security/SecBase.h> 26 #include <Security/SecBase.h>
27
28 #elif defined(USE_OPENSSL_CERTS) 27 #elif defined(USE_OPENSSL_CERTS)
29 // Forward declaration; real one in <x509.h> 28 // Forward declaration; real one in <x509.h>
30 typedef struct x509_st X509; 29 typedef struct x509_st X509;
31 typedef struct x509_store_st X509_STORE; 30 typedef struct x509_store_st X509_STORE;
32 #elif defined(USE_NSS) 31 #elif defined(USE_NSS)
33 // Forward declaration; real one in <cert.h> 32 // Forward declaration; real one in <cert.h>
34 struct CERTCertificateStr; 33 struct CERTCertificateStr;
35 #endif 34 #endif
36 35
37 class Pickle; 36 class Pickle;
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 // based on the type of the certificate. 513 // based on the type of the certificate.
515 std::string default_nickname_; 514 std::string default_nickname_;
516 #endif 515 #endif
517 516
518 DISALLOW_COPY_AND_ASSIGN(X509Certificate); 517 DISALLOW_COPY_AND_ASSIGN(X509Certificate);
519 }; 518 };
520 519
521 } // namespace net 520 } // namespace net
522 521
523 #endif // NET_CERT_X509_CERTIFICATE_H_ 522 #endif // NET_CERT_X509_CERTIFICATE_H_
OLDNEW
« no previous file with comments | « net/cert/x509_cert_types_win.cc ('k') | net/ssl/client_cert_store_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698