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

Side by Side Diff: crypto/capi_util.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: sleevi comments Created 6 years, 1 month 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 | « components/os_crypt/os_crypt_win.cc ('k') | crypto/crypto.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 CRYPTO_CAPI_UTIL_H_ 5 #ifndef CRYPTO_CAPI_UTIL_H_
6 #define CRYPTO_CAPI_UTIL_H_ 6 #define CRYPTO_CAPI_UTIL_H_
7 7
8 #include <windows.h> 8 #include <windows.h>
9 #include <wincrypt.h>
10 9
11 #include "crypto/crypto_export.h" 10 #include "crypto/crypto_export.h"
11 #include "crypto/wincrypt_shim.h"
12 12
13 namespace crypto { 13 namespace crypto {
14 14
15 // CryptAcquireContext when passed CRYPT_NEWKEYSET or CRYPT_DELETEKEYSET in 15 // CryptAcquireContext when passed CRYPT_NEWKEYSET or CRYPT_DELETEKEYSET in
16 // flags is not thread-safe. For such calls, we create a global lock to 16 // flags is not thread-safe. For such calls, we create a global lock to
17 // synchronize it. 17 // synchronize it.
18 // 18 //
19 // From "Threading Issues with Cryptographic Service Providers", 19 // From "Threading Issues with Cryptographic Service Providers",
20 // <http://msdn.microsoft.com/en-us/library/aa388149(v=VS.85).aspx>: 20 // <http://msdn.microsoft.com/en-us/library/aa388149(v=VS.85).aspx>:
21 // 21 //
22 // "The CryptAcquireContext function is generally thread safe unless 22 // "The CryptAcquireContext function is generally thread safe unless
23 // CRYPT_NEWKEYSET or CRYPT_DELETEKEYSET is specified in the dwFlags 23 // CRYPT_NEWKEYSET or CRYPT_DELETEKEYSET is specified in the dwFlags
24 // parameter." 24 // parameter."
25 CRYPTO_EXPORT BOOL CryptAcquireContextLocked(HCRYPTPROV* prov, 25 CRYPTO_EXPORT BOOL CryptAcquireContextLocked(HCRYPTPROV* prov,
26 LPCWSTR container, 26 LPCWSTR container,
27 LPCWSTR provider, 27 LPCWSTR provider,
28 DWORD prov_type, 28 DWORD prov_type,
29 DWORD flags); 29 DWORD flags);
30 30
31 // Wrappers of malloc and free for CryptoAPI routines that need memory 31 // Wrappers of malloc and free for CryptoAPI routines that need memory
32 // allocators, such as in CRYPT_DECODE_PARA. Such routines require WINAPI 32 // allocators, such as in CRYPT_DECODE_PARA. Such routines require WINAPI
33 // calling conventions. 33 // calling conventions.
34 CRYPTO_EXPORT void* WINAPI CryptAlloc(size_t size); 34 CRYPTO_EXPORT void* WINAPI CryptAlloc(size_t size);
35 CRYPTO_EXPORT void WINAPI CryptFree(void* p); 35 CRYPTO_EXPORT void WINAPI CryptFree(void* p);
36 36
37 } // namespace crypto 37 } // namespace crypto
38 38
39 #endif // CRYPTO_CAPI_UTIL_H_ 39 #endif // CRYPTO_CAPI_UTIL_H_
OLDNEW
« no previous file with comments | « components/os_crypt/os_crypt_win.cc ('k') | crypto/crypto.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698