net/cert/sha256_legacy_support_win.h - 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: net/cert/sha256_legacy_support_win.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: 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

« chrome/browser/password_manager/password_store_win_unittest.cc ('K') | « net/cert/cert_verify_proc_win.cc ('k') | net/cert/sha256_legacy_support_win.cc » ('j') | net/cert/x509_certificate.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/cert/sha256_legacy_support_win.h

diff --git a/net/cert/sha256_legacy_support_win.h b/net/cert/sha256_legacy_support_win.h

index c98414ca94b882d5b060a91fe6c6795a9b327c09..4243a8fa35f62e04f3eac41d5c134a965df8ef5c 100644

--- a/net/cert/sha256_legacy_support_win.h

+++ b/net/cert/sha256_legacy_support_win.h

@@ -6,8 +6,8 @@

#define NET_CERT_SHA256_LEGACY_SUPPORT_WIN_H_

#include <windows.h>

-#include <wincrypt.h>

+#include "crypto/wincrypt.h"

#include "net/base/net_export.h"

namespace net {