diff options
| author | davidben <davidben@chromium.org> | 2014-10-29 17:39:38 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-30 00:40:05 +0000 |
| commit | c6ac2609dd032e468440cd4f7f86770b4cb9774d (patch) | |
| tree | 629420f416f2b4c183a5aa3048b040b5919c7ffc /net/cert/x509_cert_types_win.cc | |
| parent | 6fdf39c8fcf627270840b321cf329d53ab7261d1 (diff) | |
| download | chromium_src-c6ac2609dd032e468440cd4f7f86770b4cb9774d.zip chromium_src-c6ac2609dd032e468440cd4f7f86770b4cb9774d.tar.gz chromium_src-c6ac2609dd032e468440cd4f7f86770b4cb9774d.tar.bz2 | |
Add crypto/wincrypt_shim.h wrapper header to resolve BoringSSL conflicts.
wincrypt.h defines macros that conflict with BoringSSL. Introduce a
crypto/wincrypt_shim.h wrapper header which #undefs those macros and
instead #defines replacement ones. All Chromium headers should
use this wrapper header.
BUG=338884
Review URL: https://codereview.chromium.org/686883002
Cr-Commit-Position: refs/heads/master@{#301994}
Diffstat (limited to 'net/cert/x509_cert_types_win.cc')
| -rw-r--r-- | net/cert/x509_cert_types_win.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/cert/x509_cert_types_win.cc b/net/cert/x509_cert_types_win.cc index 570f5fc..8a456f3 100644 --- a/net/cert/x509_cert_types_win.cc +++ b/net/cert/x509_cert_types_win.cc @@ -5,13 +5,13 @@ #include "net/cert/x509_cert_types.h" #include <windows.h> -#include <wincrypt.h> #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "crypto/capi_util.h" +#include "crypto/wincrypt_shim.h" #pragma comment(lib, "crypt32.lib") @@ -97,7 +97,7 @@ bool CertPrincipal::ParseDistinguishedName(const void* ber_name_data, DWORD name_info_size = 0; BOOL rv; rv = CryptDecodeObjectEx(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, - X509_NAME, + WINCRYPT_X509_NAME, reinterpret_cast<const BYTE*>(ber_name_data), length, CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, |