Add crypto/wincrypt_shim.h wrapper header to resolve BoringSSL conflicts.
commitc6ac2609dd032e468440cd4f7f86770b4cb9774d
authordavidben <davidben@chromium.org>
Thu, 30 Oct 2014 00:39:38 +0000 (29 17:39 -0700)
committerCommit bot <commit-bot@chromium.org>
Thu, 30 Oct 2014 00:40:05 +0000 (30 00:40 +0000)
tree629420f416f2b4c183a5aa3048b040b5919c7ffc
parent6fdf39c8fcf627270840b321cf329d53ab7261d1
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}
21 files changed:
chrome/app/signature_validator_win.cc
chrome/app/signature_validator_win_unittest.cc
chrome/browser/password_manager/password_store_win_unittest.cc
components/os_crypt/ie7_password_win.cc
components/os_crypt/os_crypt_win.cc
crypto/capi_util.h
crypto/crypto.gypi
crypto/hmac_win.cc
crypto/scoped_capi_types.h
crypto/wincrypt_shim.h [new file with mode: 0644]
net/base/keygen_handler_win.cc
net/cert/cert_database_win.cc
net/cert/cert_verify_proc_win.cc
net/cert/sha256_legacy_support_win.cc
net/cert/sha256_legacy_support_win.h
net/cert/test_root_certs.h
net/cert/test_root_certs_win.cc
net/cert/x509_cert_types_win.cc
net/cert/x509_certificate.h
net/ssl/client_cert_store_win.cc
net/test/spawned_test_server/local_test_server_win.cc