summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordavidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-11 03:21:17 +0000
committerdavidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-11 03:21:17 +0000
commitdf5a2517f2725c747509317b218d7812c534b523 (patch)
tree34eb0025c092398bc76a712060f287581e2413ff
parent80ab20e77b2f50f895da5d09b618ab9521ae6077 (diff)
downloadchromium_src-df5a2517f2725c747509317b218d7812c534b523.zip
chromium_src-df5a2517f2725c747509317b218d7812c534b523.tar.gz
chromium_src-df5a2517f2725c747509317b218d7812c534b523.tar.bz2
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
-rw-r--r--chrome/chrome_common.gypi16
-rw-r--r--chrome/common/extensions/api/networking_private/networking_private_crypto_nss.cc (renamed from chrome/common/extensions/api/networking_private/networking_private_crypto.cc)6
-rw-r--r--chrome/common/extensions/api/networking_private/networking_private_crypto_openssl.cc41
3 files changed, 58 insertions, 5 deletions
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index cbd4ab1..0359bcd 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -339,7 +339,8 @@
}],
['OS=="win" or OS=="mac"', {
'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/media_galleries/itunes_library.cc',
'common/media_galleries/itunes_library.h',
@@ -511,6 +512,17 @@
['safe_browsing==2', {
'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': [
['OS == "ios"', {
@@ -646,8 +658,6 @@
}],
['use_openssl==1', {
'sources!': [
- # networking_private_crypto.cc uses NSS functions.
- 'common/extensions/api/networking_private/networking_private_crypto.cc',
'common/net/x509_certificate_model_nss.cc',
],
},
diff --git a/chrome/common/extensions/api/networking_private/networking_private_crypto.cc b/chrome/common/extensions/api/networking_private/networking_private_crypto_nss.cc
index a885b54..920694a 100644
--- a/chrome/common/extensions/api/networking_private/networking_private_crypto.cc
+++ b/chrome/common/extensions/api/networking_private/networking_private_crypto_nss.cc
@@ -69,9 +69,11 @@ bool GetDERFromPEM(const std::string& pem_data,
} // namespace
-NetworkingPrivateCrypto::NetworkingPrivateCrypto() {}
+NetworkingPrivateCrypto::NetworkingPrivateCrypto() {
+}
-NetworkingPrivateCrypto::~NetworkingPrivateCrypto() {}
+NetworkingPrivateCrypto::~NetworkingPrivateCrypto() {
+}
bool NetworkingPrivateCrypto::VerifyCredentials(
const std::string& certificate,
diff --git a/chrome/common/extensions/api/networking_private/networking_private_crypto_openssl.cc b/chrome/common/extensions/api/networking_private/networking_private_crypto_openssl.cc
new file mode 100644
index 0000000..95a6bd6
--- /dev/null
+++ b/chrome/common/extensions/api/networking_private/networking_private_crypto_openssl.cc
@@ -0,0 +1,41 @@
+// 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;
+}