Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1146)

Unified Diff: content/browser/renderer_host/pepper_tcp_socket.cc

Issue 9699100: Add functionality to pppapi TCPSocket to support secure sockets in flash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/pepper_tcp_socket.cc
diff --git a/content/browser/renderer_host/pepper_tcp_socket.cc b/content/browser/renderer_host/pepper_tcp_socket.cc
index e80e8e65f7772ee5b12c7c96a79f9061bee324d4..d6007f5d136375ebfc60d0024751687e43bff166 100644
--- a/content/browser/renderer_host/pepper_tcp_socket.cc
+++ b/content/browser/renderer_host/pepper_tcp_socket.cc
@@ -104,8 +104,11 @@ void PepperTCPSocket::ConnectWithNetAddress(
StartConnect(address_list_);
}
-void PepperTCPSocket::SSLHandshake(const std::string& server_name,
- uint16_t server_port) {
+void PepperTCPSocket::SSLHandshake(
+ const std::string& server_name,
+ uint16_t server_port,
+ const std::vector<std::vector<char> >& trusted_certs,
+ const std::vector<std::vector<char> >& untrusted_certs) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
// Allow to do SSL handshake only if currently the socket has been connected
@@ -119,6 +122,8 @@ void PepperTCPSocket::SSLHandshake(const std::string& server_name,
}
connection_state_ = SSL_HANDSHAKE_IN_PROGRESS;
+ // TODO(raymes,rsleevi): Use trusted/untrusted certificates when connecting.
+
net::ClientSocketHandle* handle = new net::ClientSocketHandle();
handle->set_socket(socket_.release());
net::ClientSocketFactory* factory =
@@ -275,8 +280,22 @@ void PepperTCPSocket::SendWriteACKError() {
}
void PepperTCPSocket::SendSSLHandshakeACK(bool succeeded) {
+ ppapi::PPB_X509Certificate_Fields certificate_fields;
+ if (succeeded) {
+ // Our socket is guaranteed to be an SSL socket if we get here.
+ net::SSLClientSocket* ssl_socket =
+ static_cast<net::SSLClientSocket*>(socket_.get());
+ net::SSLInfo ssl_info;
+ ssl_socket->GetSSLInfo(&ssl_info);
+ if (ssl_info.cert.get())
+ GetCertificateFields(*ssl_info.cert, &certificate_fields);
+ }
manager_->Send(new PpapiMsg_PPBTCPSocket_SSLHandshakeACK(
- routing_id_, plugin_dispatcher_id_, socket_id_, succeeded));
+ routing_id_,
+ plugin_dispatcher_id_,
+ socket_id_,
+ succeeded,
+ certificate_fields));
}
void PepperTCPSocket::OnResolveCompleted(int result) {
« no previous file with comments | « content/browser/renderer_host/pepper_tcp_socket.h ('k') | content/renderer/pepper/pepper_plugin_delegate_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698