| OLD | NEW |
| 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 <Security/SecBase.h> | 7 #include <Security/SecBase.h> |
| 8 #include <Security/SecCertificate.h> | 8 #include <Security/SecCertificate.h> |
| 9 #include <Security/SecIdentity.h> | 9 #include <Security/SecIdentity.h> |
| 10 #include <Security/SecKey.h> | 10 #include <Security/SecKey.h> |
| (...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 if (status != noErr) | 237 if (status != noErr) |
| 238 return nullptr; | 238 return nullptr; |
| 239 | 239 |
| 240 if (cssm_key->KeyHeader.AlgorithmId != CSSM_ALGID_RSA && | 240 if (cssm_key->KeyHeader.AlgorithmId != CSSM_ALGID_RSA && |
| 241 cssm_key->KeyHeader.AlgorithmId != CSSM_ALGID_ECDSA) { | 241 cssm_key->KeyHeader.AlgorithmId != CSSM_ALGID_ECDSA) { |
| 242 LOG(ERROR) << "Unknown key type: " << cssm_key->KeyHeader.AlgorithmId; | 242 LOG(ERROR) << "Unknown key type: " << cssm_key->KeyHeader.AlgorithmId; |
| 243 return nullptr; | 243 return nullptr; |
| 244 } | 244 } |
| 245 return make_scoped_refptr(new ThreadedSSLPrivateKey( | 245 return make_scoped_refptr(new ThreadedSSLPrivateKey( |
| 246 base::WrapUnique(new SSLPlatformKeyMac(private_key.get(), cssm_key)), | 246 base::WrapUnique(new SSLPlatformKeyMac(private_key.get(), cssm_key)), |
| 247 GetSSLPlatformKeyTaskRunner())); | 247 SSLPlatformKeyTaskRunner::Get())); |
| 248 } | 248 } |
| 249 | 249 |
| 250 #pragma clang diagnostic pop // "-Wdeprecated-declarations" | 250 #pragma clang diagnostic pop // "-Wdeprecated-declarations" |
| 251 | 251 |
| 252 } // namespace net | 252 } // namespace net |
| OLD | NEW |