Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(242)

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: 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/hmac_win.cc
diff --git a/crypto/hmac_win.cc b/crypto/hmac_win.cc
index ba7d827503513cb2b6fe40c60c328457beb3a979..d36701edfadbfe7fafa263b6d8739895d36cb62d 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.h"
namespace crypto {

Powered by Google App Engine
This is Rietveld 408576698