components/os_crypt/ie7_password_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: components/os_crypt/ie7_password_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

« chrome/browser/password_manager/password_store_win_unittest.cc ('K') | « chrome/browser/password_manager/password_store_win_unittest.cc ('k') | components/os_crypt/os_crypt_win.cc » ('j') | net/cert/x509_certificate.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/os_crypt/ie7_password_win.cc

diff --git a/components/os_crypt/ie7_password_win.cc b/components/os_crypt/ie7_password_win.cc

index ef7fbd54071d7260de5d65c6aec199de06c2e9c1..bfc113efba19cde860fa3428c189820b24fa983a 100644

--- a/components/os_crypt/ie7_password_win.cc

+++ b/components/os_crypt/ie7_password_win.cc

@@ -4,7 +4,6 @@

#include "components/os_crypt/ie7_password_win.h"

-#include <wincrypt.h>

#include <string>

#include <vector>

@@ -12,6 +11,7 @@

#include "base/sha1.h"

#include "base/strings/string_util.h"

#include "base/strings/stringprintf.h"

+#include "crypto/wincrypt.h"

namespace {