| 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 <keyhi.h> | 5 #include <keyhi.h> |
| 6 #include <openssl/bn.h> | 6 #include <openssl/bn.h> |
| 7 #include <openssl/ecdsa.h> | 7 #include <openssl/ecdsa.h> |
| 8 #include <openssl/rsa.h> | 8 #include <openssl/rsa.h> |
| 9 #include <pk11pub.h> | 9 #include <pk11pub.h> |
| 10 #include <prerror.h> | 10 #include <prerror.h> |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 type = SSLPrivateKey::Type::RSA; | 176 type = SSLPrivateKey::Type::RSA; |
| 177 break; | 177 break; |
| 178 case ecKey: | 178 case ecKey: |
| 179 type = SSLPrivateKey::Type::ECDSA; | 179 type = SSLPrivateKey::Type::ECDSA; |
| 180 break; | 180 break; |
| 181 default: | 181 default: |
| 182 LOG(ERROR) << "Unknown key type: " << nss_type; | 182 LOG(ERROR) << "Unknown key type: " << nss_type; |
| 183 return nullptr; | 183 return nullptr; |
| 184 } | 184 } |
| 185 return make_scoped_refptr(new ThreadedSSLPrivateKey( | 185 return make_scoped_refptr(new ThreadedSSLPrivateKey( |
| 186 base::WrapUnique(new SSLPlatformKeyNSS(type, std::move(key))), | 186 base::MakeUnique<SSLPlatformKeyNSS>(type, std::move(key)), |
| 187 GetSSLPlatformKeyTaskRunner())); | 187 GetSSLPlatformKeyTaskRunner())); |
| 188 } | 188 } |
| 189 | 189 |
| 190 } // namespace net | 190 } // namespace net |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2259823002:
Re-write many calls to WrapUnique() with MakeUnique() (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master