crypto/hmac_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: crypto/hmac_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: crypto/hmac_win.cc

diff --git a/crypto/hmac_win.cc b/crypto/hmac_win.cc

index ba7d827503513cb2b6fe40c60c328457beb3a979..99b3a60d57efb41fd73f30084e8a080ef77fd30c 100644

--- a/crypto/hmac_win.cc

+++ b/crypto/hmac_win.cc

@@ -5,7 +5,6 @@

#include "crypto/hmac.h"

#include <windows.h>

-#include <wincrypt.h>

#include <algorithm>

#include <vector>

@@ -14,6 +13,7 @@

#include "crypto/scoped_capi_types.h"

#include "crypto/third_party/nss/chromium-blapi.h"

#include "crypto/third_party/nss/chromium-sha256.h"

+#include "crypto/wincrypt_shim.h"

namespace crypto {

« no previous file with comments | « crypto/crypto.gypi ('k') | crypto/scoped_capi_types.h » ('j') | no next file with comments »