net/base/keygen_handler_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/base/keygen_handler_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: sleevi comments 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: net/base/keygen_handler_win.cc

diff --git a/net/base/keygen_handler_win.cc b/net/base/keygen_handler_win.cc

index f97ada76423ea10191f4236110377f2db4f29d14..ffa3b2e414e66585aca6c53acd25f8ad3177a73f 100644

--- a/net/base/keygen_handler_win.cc

+++ b/net/base/keygen_handler_win.cc

@@ -5,10 +5,7 @@

#include "net/base/keygen_handler.h"

#include <windows.h>

-#include <wincrypt.h>

-#pragma comment(lib, "crypt32.lib")

#include <rpc.h>

-#pragma comment(lib, "rpcrt4.lib")

#include <list>

#include <string>

@@ -22,7 +19,10 @@

#include "base/strings/utf_string_conversions.h"

#include "crypto/capi_util.h"

#include "crypto/scoped_capi_types.h"

+#include "crypto/wincrypt_shim.h"

+#pragma comment(lib, "crypt32.lib")

+#pragma comment(lib, "rpcrt4.lib")

namespace net {

« no previous file with comments | « crypto/wincrypt_shim.h ('k') | net/cert/cert_database_win.cc » ('j') | no next file with comments »