net/ssl/client_cert_store_win.cc - 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/ssl/client_cert_store_win.cc

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

« net/cert/x509_certificate.h ('K') | « net/cert/x509_certificate.h ('k') | net/test/spawned_test_server/local_test_server_win.cc » ('j') | net/test/spawned_test_server/local_test_server_win.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/ssl/client_cert_store_win.cc

diff --git a/net/ssl/client_cert_store_win.cc b/net/ssl/client_cert_store_win.cc

index 24ae1aa6d51bd308559cdb84afdddd4ed5851953..82866172f7c7adf315e2ec884e245bb444368f16 100644

--- a/net/ssl/client_cert_store_win.cc

+++ b/net/ssl/client_cert_store_win.cc

@@ -9,12 +9,12 @@

#define SECURITY_WIN32 // Needs to be defined before including security.h

#include <windows.h>

-#include <wincrypt.h>

#include <security.h>

#include "base/callback.h"

#include "base/logging.h"

#include "crypto/scoped_capi_types.h"

+#include "crypto/wincrypt.h"

#include "net/cert/x509_util.h"

namespace net {