| Index: net/base/openssl_private_key_store_android.cc
|
| diff --git a/net/base/openssl_private_key_store_android.cc b/net/base/openssl_private_key_store_android.cc
|
| index e9851077faa836140dd94c645ae2e2e63ef17bbd..514c01fa7f6e78dd07807b61191d76f93ef8d867 100644
|
| --- a/net/base/openssl_private_key_store_android.cc
|
| +++ b/net/base/openssl_private_key_store_android.cc
|
| @@ -14,8 +14,7 @@
|
|
|
| namespace net {
|
|
|
| -bool OpenSSLPrivateKeyStore::StoreKeyPair(const GURL& url,
|
| - EVP_PKEY* pkey) {
|
| +bool OpenSSLPrivateKeyStore::StoreKeyPair(const GURL& url, EVP_PKEY* pkey) {
|
| // Always clear openssl errors on exit.
|
| crypto::OpenSSLErrStackTracer err_trace(FROM_HERE);
|
|
|
| @@ -29,17 +28,17 @@ bool OpenSSLPrivateKeyStore::StoreKeyPair(const GURL& url,
|
| // in a format that is incompatible with what the platform expects.
|
| unsigned char* private_key = NULL;
|
| int private_len = 0;
|
| - crypto::ScopedOpenSSL<
|
| - PKCS8_PRIV_KEY_INFO,
|
| - PKCS8_PRIV_KEY_INFO_free> pkcs8(EVP_PKEY2PKCS8(pkey));
|
| + crypto::ScopedOpenSSL<PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_free> pkcs8(
|
| + EVP_PKEY2PKCS8(pkey));
|
| if (pkcs8.get() != NULL) {
|
| private_len = i2d_PKCS8_PRIV_KEY_INFO(pkcs8.get(), &private_key);
|
| }
|
| bool ret = false;
|
| if (public_len > 0 && private_len > 0) {
|
| - ret = net::android::StoreKeyPair(
|
| - static_cast<const uint8*>(public_key), public_len,
|
| - static_cast<const uint8*>(private_key), private_len);
|
| + ret = net::android::StoreKeyPair(static_cast<const uint8*>(public_key),
|
| + public_len,
|
| + static_cast<const uint8*>(private_key),
|
| + private_len);
|
| }
|
| LOG_IF(ERROR, !ret) << "StoreKeyPair failed. pub len = " << public_len
|
| << " priv len = " << private_len;
|
|
|