Commit df5a2517 authored by davidben@chromium.org's avatar davidben@chromium.org

Add stub networking_private OpenSSL implementation.

Part of getting OpenSSL working on OS X, the networking_private_crypto.cc
implementation is renamed to networking_private_crypto_nss.cc and a stubbed out
version networking_private_crypto_openssl.cc.

BUG=393023

Review URL: https://codereview.chromium.org/387753003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282526 0039d316-1c4b-4281-b951-d872f2087c98
parent 80ab20e7
...@@ -339,7 +339,8 @@ ...@@ -339,7 +339,8 @@
}], }],
['OS=="win" or OS=="mac"', { ['OS=="win" or OS=="mac"', {
'sources': [ 'sources': [
'common/extensions/api/networking_private/networking_private_crypto.cc', 'common/extensions/api/networking_private/networking_private_crypto_nss.cc',
'common/extensions/api/networking_private/networking_private_crypto_openssl.cc',
'common/extensions/api/networking_private/networking_private_crypto.h', 'common/extensions/api/networking_private/networking_private_crypto.h',
'common/media_galleries/itunes_library.cc', 'common/media_galleries/itunes_library.cc',
'common/media_galleries/itunes_library.h', 'common/media_galleries/itunes_library.h',
...@@ -511,6 +512,17 @@ ...@@ -511,6 +512,17 @@
['safe_browsing==2', { ['safe_browsing==2', {
'defines': [ 'MOBILE_SAFE_BROWSING' ], 'defines': [ 'MOBILE_SAFE_BROWSING' ],
}], }],
['use_openssl==1', {
'sources!': [
'common/extensions/api/networking_private/networking_private_crypto_nss.cc',
],
},
{ # else !use_openssl
'sources!': [
'common/extensions/api/networking_private/networking_private_crypto_openssl.cc',
],
},
],
], ],
'target_conditions': [ 'target_conditions': [
['OS == "ios"', { ['OS == "ios"', {
...@@ -646,8 +658,6 @@ ...@@ -646,8 +658,6 @@
}], }],
['use_openssl==1', { ['use_openssl==1', {
'sources!': [ 'sources!': [
# networking_private_crypto.cc uses NSS functions.
'common/extensions/api/networking_private/networking_private_crypto.cc',
'common/net/x509_certificate_model_nss.cc', 'common/net/x509_certificate_model_nss.cc',
], ],
}, },
......
...@@ -69,9 +69,11 @@ bool GetDERFromPEM(const std::string& pem_data, ...@@ -69,9 +69,11 @@ bool GetDERFromPEM(const std::string& pem_data,
} // namespace } // namespace
NetworkingPrivateCrypto::NetworkingPrivateCrypto() {} NetworkingPrivateCrypto::NetworkingPrivateCrypto() {
}
NetworkingPrivateCrypto::~NetworkingPrivateCrypto() {} NetworkingPrivateCrypto::~NetworkingPrivateCrypto() {
}
bool NetworkingPrivateCrypto::VerifyCredentials( bool NetworkingPrivateCrypto::VerifyCredentials(
const std::string& certificate, const std::string& certificate,
......
// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "chrome/common/extensions/api/networking_private/networking_private_crypto.h"
#include "base/logging.h"
NetworkingPrivateCrypto::NetworkingPrivateCrypto() {
}
NetworkingPrivateCrypto::~NetworkingPrivateCrypto() {
}
bool NetworkingPrivateCrypto::VerifyCredentials(
const std::string& certificate,
const std::string& signature,
const std::string& data,
const std::string& connected_mac) {
// https://crbug.com/393023
NOTIMPLEMENTED();
return false;
}
bool NetworkingPrivateCrypto::EncryptByteString(
const std::vector<uint8>& pub_key_der,
const std::string& data,
std::vector<uint8>* encrypted_output) {
// https://crbug.com/393023
NOTIMPLEMENTED();
return false;
}
bool NetworkingPrivateCrypto::DecryptByteString(
const std::string& private_key_pem,
const std::vector<uint8>& encrypted_data,
std::string* decrypted_output) {
// https://crbug.com/393023
NOTIMPLEMENTED();
return false;
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment