crypto/crypto.gypi - Issue 686883002: Add crypto/wincrypt_shim.h wrapper header to resolve BoringSSL conflicts.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: crypto/crypto.gypi

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: X509_NAME -> WINCRYPT_X509_NAME, rebase Created 6 years, 2 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 side-by-side diff with in-line comments

Download patch

Index: crypto/crypto.gypi

diff --git a/crypto/crypto.gypi b/crypto/crypto.gypi

index de65e198ebb055a84a010eebe65dc9cd19d511e0..a42e464a4dfcc311024b0e799f98d48db3d2090c 100644

--- a/crypto/crypto.gypi

+++ b/crypto/crypto.gypi

@@ -20,6 +20,7 @@

'third_party/nss/chromium-prtypes.h',

'third_party/nss/chromium-sha256.h',

'third_party/nss/sha512.cc',

+ 'wincrypt.h',

'hmac_win64_related_sources': [ '<@(hmac_win64_related_sources)' ],

« chrome/browser/password_manager/password_store_win_unittest.cc ('K') | « crypto/capi_util.h ('k') | crypto/hmac_win.cc » ('j') | net/cert/x509_certificate.h » ('J')