| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/client_cert_store_mac.h" | 5 #include "net/ssl/client_cert_store_mac.h" |
| 6 | 6 |
| 7 #include <CommonCrypto/CommonDigest.h> | 7 #include <CommonCrypto/CommonDigest.h> |
| 8 #include <CoreFoundation/CFArray.h> | 8 #include <CoreFoundation/CFArray.h> |
| 9 #include <CoreServices/CoreServices.h> | 9 #include <CoreServices/CoreServices.h> |
| 10 #include <Security/SecBase.h> | 10 #include <Security/SecBase.h> |
| 11 #include <Security/Security.h> | 11 #include <Security/Security.h> |
| 12 | 12 |
| 13 #include <algorithm> | 13 #include <algorithm> |
| 14 #include <string> | 14 #include <string> |
| 15 | 15 |
| 16 #include "base/callback.h" | 16 #include "base/callback.h" |
| 17 #include "base/logging.h" | 17 #include "base/logging.h" |
| 18 #include "base/mac/mac_logging.h" | 18 #include "base/mac/mac_logging.h" |
| 19 #include "base/mac/scoped_cftyperef.h" | 19 #include "base/mac/scoped_cftyperef.h" |
| 20 #include "base/strings/sys_string_conversions.h" | 20 #include "base/strings/sys_string_conversions.h" |
| 21 #include "base/synchronization/lock.h" | 21 #include "base/synchronization/lock.h" |
| 22 #include "crypto/mac_security_services_lock.h" | 22 #include "crypto/mac_security_services_lock.h" |
| 23 #include "net/base/host_port_pair.h" | 23 #include "net/base/host_port_pair.h" |
| 24 #include "net/cert/x509_util.h" | 24 #include "net/cert/x509_util.h" |
| 25 #include "net/cert/x509_util_ios_and_mac.h" |
| 25 #include "net/cert/x509_util_mac.h" | 26 #include "net/cert/x509_util_mac.h" |
| 26 | 27 |
| 27 using base::ScopedCFTypeRef; | 28 using base::ScopedCFTypeRef; |
| 28 | 29 |
| 29 namespace net { | 30 namespace net { |
| 30 | 31 |
| 31 // CSSM functions are deprecated as of OSX 10.7, but have no replacement. | 32 // CSSM functions are deprecated as of OSX 10.7, but have no replacement. |
| 32 // https://bugs.chromium.org/p/chromium/issues/detail?id=590914#c1 | 33 // https://bugs.chromium.org/p/chromium/issues/detail?id=590914#c1 |
| 33 #pragma clang diagnostic push | 34 #pragma clang diagnostic push |
| 34 #pragma clang diagnostic ignored "-Wdeprecated-declarations" | 35 #pragma clang diagnostic ignored "-Wdeprecated-declarations" |
| (...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 334 const SSLCertRequestInfo& request, | 335 const SSLCertRequestInfo& request, |
| 335 CertificateList* selected_certs) { | 336 CertificateList* selected_certs) { |
| 336 GetClientCertsImpl( | 337 GetClientCertsImpl( |
| 337 preferred_cert, regular_certs, request, false, selected_certs); | 338 preferred_cert, regular_certs, request, false, selected_certs); |
| 338 return true; | 339 return true; |
| 339 } | 340 } |
| 340 | 341 |
| 341 #pragma clang diagnostic pop // "-Wdeprecated-declarations" | 342 #pragma clang diagnostic pop // "-Wdeprecated-declarations" |
| 342 | 343 |
| 343 } // namespace net | 344 } // namespace net |
| OLD | NEW |