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

Side by Side Diff: net/ssl/ssl_platform_key_mac.cc

Issue 1535363003: Switch to standard integer types in net/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: stddef Created 5 years 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 | « net/ssl/ssl_key_logger.cc ('k') | net/ssl/ssl_private_key.h » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #include "net/ssl/ssl_platform_key.h" 5 #include "net/ssl/ssl_platform_key.h"
6 6
7 #include <openssl/ecdsa.h> 7 #include <openssl/ecdsa.h>
8 #include <openssl/obj.h> 8 #include <openssl/obj.h>
9 #include <openssl/rsa.h> 9 #include <openssl/rsa.h>
10 10
11 #include <Security/cssm.h> 11 #include <Security/cssm.h>
12 #include <Security/SecBase.h> 12 #include <Security/SecBase.h>
13 #include <Security/SecCertificate.h> 13 #include <Security/SecCertificate.h>
14 #include <Security/SecIdentity.h> 14 #include <Security/SecIdentity.h>
15 #include <Security/SecKey.h> 15 #include <Security/SecKey.h>
16 16
17 #include "base/location.h" 17 #include "base/location.h"
18 #include "base/logging.h" 18 #include "base/logging.h"
19 #include "base/mac/mac_logging.h" 19 #include "base/mac/mac_logging.h"
20 #include "base/mac/scoped_cftyperef.h" 20 #include "base/mac/scoped_cftyperef.h"
21 #include "base/macros.h"
21 #include "base/memory/scoped_policy.h" 22 #include "base/memory/scoped_policy.h"
22 #include "base/memory/scoped_ptr.h" 23 #include "base/memory/scoped_ptr.h"
23 #include "base/sequenced_task_runner.h" 24 #include "base/sequenced_task_runner.h"
24 #include "base/synchronization/lock.h" 25 #include "base/synchronization/lock.h"
25 #include "crypto/mac_security_services_lock.h" 26 #include "crypto/mac_security_services_lock.h"
26 #include "crypto/openssl_util.h" 27 #include "crypto/openssl_util.h"
27 #include "crypto/scoped_openssl_types.h" 28 #include "crypto/scoped_openssl_types.h"
28 #include "net/base/net_errors.h" 29 #include "net/base/net_errors.h"
29 #include "net/cert/x509_certificate.h" 30 #include "net/cert/x509_certificate.h"
30 #include "net/ssl/ssl_platform_key_task_runner.h" 31 #include "net/ssl/ssl_platform_key_task_runner.h"
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 cssm_key->KeyHeader.AlgorithmId != CSSM_ALGID_ECDSA) { 235 cssm_key->KeyHeader.AlgorithmId != CSSM_ALGID_ECDSA) {
235 LOG(ERROR) << "Unknown key type: " << cssm_key->KeyHeader.AlgorithmId; 236 LOG(ERROR) << "Unknown key type: " << cssm_key->KeyHeader.AlgorithmId;
236 return nullptr; 237 return nullptr;
237 } 238 }
238 return make_scoped_refptr(new ThreadedSSLPrivateKey( 239 return make_scoped_refptr(new ThreadedSSLPrivateKey(
239 make_scoped_ptr(new SSLPlatformKeyMac(private_key.get(), cssm_key)), 240 make_scoped_ptr(new SSLPlatformKeyMac(private_key.get(), cssm_key)),
240 GetSSLPlatformKeyTaskRunner())); 241 GetSSLPlatformKeyTaskRunner()));
241 } 242 }
242 243
243 } // namespace net 244 } // namespace net
OLDNEW
« no previous file with comments | « net/ssl/ssl_key_logger.cc ('k') | net/ssl/ssl_private_key.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698