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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/cert/x509_certificate.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/x509_cert_types_win.cc ('k') | net/ssl/client_cert_store_win.cc » ('j') | net/test/spawned_test_server/local_test_server_win.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/cert/x509_certificate.h
diff --git a/net/cert/x509_certificate.h b/net/cert/x509_certificate.h
index 008de71f13e31fb638ea452e83ed94aae139ea48..4cdcfcd4dc4496042b6a320f87461bd69fec6a5e 100644
--- a/net/cert/x509_certificate.h
+++ b/net/cert/x509_certificate.h
@@ -20,7 +20,8 @@
#if defined(OS_WIN)
#include <windows.h>
-#include <wincrypt.h>
+#include "crypto/wincrypt.h"
+
Ryan Sleevi 2014/10/29 20:40:24 no newline (here or line 28)
davidben 2014/10/29 22:49:58 Done.
#elif defined(OS_MACOSX)
#include <CoreFoundation/CFArray.h>
#include <Security/SecBase.h>
« chrome/browser/password_manager/password_store_win_unittest.cc ('K') | « net/cert/x509_cert_types_win.cc ('k') | net/ssl/client_cert_store_win.cc » ('j') | net/test/spawned_test_server/local_test_server_win.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698