net/cert/x509_cert_types_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/cert/x509_cert_types_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/cert/x509_cert_types_win.cc

diff --git a/net/cert/x509_cert_types_win.cc b/net/cert/x509_cert_types_win.cc

index 570f5fc80133d6e92be42aa50f78093aa1a15ab9..8a456f3b0d0a47af3393ad3d40808f268d8c36e4 100644

--- a/net/cert/x509_cert_types_win.cc

+++ b/net/cert/x509_cert_types_win.cc

@@ -5,13 +5,13 @@

#include "net/cert/x509_cert_types.h"

#include <windows.h>

-#include <wincrypt.h>

#include "base/logging.h"

#include "base/memory/scoped_ptr.h"

#include "base/strings/string_util.h"

#include "base/strings/utf_string_conversions.h"

#include "crypto/capi_util.h"

+#include "crypto/wincrypt_shim.h"

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

@@ -97,7 +97,7 @@ bool CertPrincipal::ParseDistinguishedName(const void* ber_name_data,

DWORD name_info_size = 0;

BOOL rv;

rv = CryptDecodeObjectEx(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,

- X509_NAME,

+ WINCRYPT_X509_NAME,

reinterpret_cast<const BYTE*>(ber_name_data),

length,

CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG,

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