chrome/browser/ui/cryptuiapi_shim.h - Issue 2913253003: Convert Windows to use X509CertificateBytes.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/ui/cryptuiapi_shim.h

Issue 2913253003: Convert Windows to use X509CertificateBytes. (Closed)

Patch Set: rebase Created 3 years, 6 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:

OLD	NEW
(Empty)
	1 // Copyright 2017 The Chromium Authors. All rights reserved.

	2 // Use of this source code is governed by a BSD-style license that can be

	3 // found in the LICENSE file.

	4

	5 #ifndef CHROME_BROWSER_UI_CRYPTUIAPI_SHIM_H_

	6 #define CHROME_BROWSER_UI_CRYPTUIAPI_SHIM_H_

	7

	8 // cryptuiapi.h includes wincrypt.h which defines macros which conflict with

	9 // OpenSSL's types. This header includes cryptuiapi.h and then wincrypt_shim.h

	10 // which undefines the OpenSSL macros which conflict. Any Chromium headers

	11 // which include cryptuiapi should instead include this header.
	davidben 2017/06/15 23:55:18 Blegh. I wonder how crazy it'd be to add a #define Blegh. I wonder how crazy it'd be to add a #define to BoringSSL which suppresses everything relating to crypto/x509 from the headers, now that we've gotten pretty far in unshipping. I guess we'd need to be fully there. I was going to say I can break the ssl.h => x509.h #include link, but the problem is that'd rely on forward decls and the forward decls still collide.
	12

	13 #include <windows.h>

	14 #include <cryptuiapi.h>

	15

	16 #include "crypto/wincrypt_shim.h"

	17

	18 #endif // CHROME_BROWSER_UI_CRYPTUIAPI_SHIM_H_

OLD	NEW