crypto/wincrypt_shim.h - Issue 2095523002: Make //crypto factories return std::unique_ptr<>s

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: crypto/wincrypt_shim.h

Issue 2095523002: Make //crypto factories return std::unique_ptr<>s (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: I'm blind Created 4 years, 5 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 unified diff | Download patch

« no previous file with comments | « crypto/symmetric_key_unittest.cc ('k') | extensions/browser/content_verify_job.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

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

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef NET_CRYPTO_WINCRYPT_SHIM_H_	5 #ifndef NET_CRYPTO_WINCRYPT_SHIM_H_

6 #define NET_CRYPTO_WINCRYPT_SHIM_H_	6 #define NET_CRYPTO_WINCRYPT_SHIM_H_

7	7

8 // wincrypt.h defines macros which conflict with OpenSSL's types. This header	8 // wincrypt.h defines macros which conflict with OpenSSL's types. This header

9 // includes wincrypt and undefines the OpenSSL macros which conflict. Any	9 // includes wincrypt and undefines the OpenSSL macros which conflict. Any

10 // Chromium headers which include wincrypt should instead include this header.	10 // Chromium headers which include wincrypt should instead include this header.

11	11

12 #include <windows.h>	12 #include <windows.h>

13 #include <wincrypt.h>	13 #include <wincrypt.h>

14	14

15 // Undefine the macros which conflict with OpenSSL and define replacements. See	15 // Undefine the macros which conflict with OpenSSL and define replacements. See

16 // http://msdn.microsoft.com/en-us/library/windows/desktop/aa378145(v=vs.85).asp x	16 // http://msdn.microsoft.com/en-us/library/windows/desktop/aa378145(v=vs.85).asp x

17 #undef X509_CERT_PAIR	17 #undef X509_CERT_PAIR

18 #undef X509_EXTENSIONS	18 #undef X509_EXTENSIONS

19 #undef X509_NAME	19 #undef X509_NAME

20	20

21 #define WINCRYPT_X509_CERT_PAIR ((LPCSTR) 53)	21 #define WINCRYPT_X509_CERT_PAIR ((LPCSTR) 53)

22 #define WINCRYPT_X509_EXTENSIONS ((LPCSTR) 5)	22 #define WINCRYPT_X509_EXTENSIONS ((LPCSTR) 5)

23 #define WINCRYPT_X509_NAME ((LPCSTR) 7)	23 #define WINCRYPT_X509_NAME ((LPCSTR) 7)

24	24

25 #endif // NET_CRYPTO_WINCRYPT_SHIM_H_	25 #endif // NET_CRYPTO_WINCRYPT_SHIM_H_

OLD	NEW