| Index: net/ssl/ssl_platform_key_android.cc
|
| diff --git a/net/ssl/ssl_platform_key_android.cc b/net/ssl/ssl_platform_key_android.cc
|
| index 6a6595cc0e651eedcacdc97804bf3cc1f8bdd0ca..3da3858ff50bdd126fc3ed7670c57c1b90e41641 100644
|
| --- a/net/ssl/ssl_platform_key_android.cc
|
| +++ b/net/ssl/ssl_platform_key_android.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "net/ssl/ssl_platform_key.h"
|
| +#include "net/ssl/ssl_platform_key_android.h"
|
|
|
| #include <openssl/digest.h>
|
| #include <openssl/evp.h>
|
| @@ -12,7 +12,6 @@
|
| #include "base/macros.h"
|
| #include "crypto/scoped_openssl_types.h"
|
| #include "net/base/net_errors.h"
|
| -#include "net/ssl/openssl_client_key_store.h"
|
| #include "net/ssl/ssl_platform_key_task_runner.h"
|
| #include "net/ssl/ssl_private_key.h"
|
| #include "net/ssl/threaded_ssl_private_key.h"
|
| @@ -103,6 +102,8 @@ class SSLPlatformKeyAndroid : public ThreadedSSLPrivateKey::Delegate {
|
| DISALLOW_COPY_AND_ASSIGN(SSLPlatformKeyAndroid);
|
| };
|
|
|
| +} // namespace
|
| +
|
| scoped_refptr<SSLPrivateKey> WrapOpenSSLPrivateKey(crypto::ScopedEVP_PKEY key) {
|
| if (!key)
|
| return nullptr;
|
| @@ -124,14 +125,4 @@ scoped_refptr<SSLPrivateKey> WrapOpenSSLPrivateKey(crypto::ScopedEVP_PKEY key) {
|
| GetSSLPlatformKeyTaskRunner()));
|
| }
|
|
|
| -} // namespace
|
| -
|
| -scoped_refptr<SSLPrivateKey> FetchClientCertPrivateKey(
|
| - X509Certificate* certificate) {
|
| - crypto::ScopedEVP_PKEY key =
|
| - OpenSSLClientKeyStore::GetInstance()->FetchClientCertPrivateKey(
|
| - certificate);
|
| - return WrapOpenSSLPrivateKey(std::move(key));
|
| -}
|
| -
|
| } // namespace net
|
|
|