diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-20 02:14:01 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-20 02:14:01 +0000 |
| commit | 3d5c1bdce6865b3e02cc58f0a8083eb1cbb77b47 (patch) | |
| tree | 1fcf95c5bb0b231cb97f7ef10e7078e0b4423be1 /remoting | |
| parent | 492f1c3f1296aecc8a1a33e341094e922d6d2ba5 (diff) | |
| download | chromium_src-3d5c1bdce6865b3e02cc58f0a8083eb1cbb77b47.zip chromium_src-3d5c1bdce6865b3e02cc58f0a8083eb1cbb77b47.tar.gz chromium_src-3d5c1bdce6865b3e02cc58f0a8083eb1cbb77b47.tar.bz2 | |
Don't use X509Certificate in SSLConfig.
X509Certificate class depends in OS-dependant APIs and hense cannot
be created inside of sandbox. This change allows specifying
allow_bed_certs when running inside of sandbox.
BUG=80587
TEST=Unittests
Review URL: http://codereview.chromium.org/7401003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93153 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/protocol/jingle_stream_connector.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/remoting/protocol/jingle_stream_connector.cc b/remoting/protocol/jingle_stream_connector.cc index 27fa331..59813ff 100644 --- a/remoting/protocol/jingle_stream_connector.cc +++ b/remoting/protocol/jingle_stream_connector.cc @@ -28,15 +28,14 @@ const int kTcpAckDelayMilliseconds = 10; // Helper method to create a SSL client socket. net::SSLClientSocket* CreateSSLClientSocket( - net::StreamSocket* socket, const std::string& cert_der, + net::StreamSocket* socket, const std::string& der_cert, net::CertVerifier* cert_verifier) { net::SSLConfig ssl_config; // Certificate provided by the host doesn't need authority. net::SSLConfig::CertAndStatus cert_and_status; cert_and_status.cert_status = net::CERT_STATUS_AUTHORITY_INVALID; - cert_and_status.cert = net::X509Certificate::CreateFromBytes( - cert_der.data(), cert_der.length()); + cert_and_status.der_cert = der_cert; ssl_config.allowed_bad_certs.push_back(cert_and_status); // SSLClientSocket takes ownership of the adapter. |