| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "remoting/protocol/ssl_hmac_channel_authenticator.h" | 5 #include "remoting/protocol/ssl_hmac_channel_authenticator.h" | 
| 6 | 6 | 
| 7 #include "base/bind.h" | 7 #include "base/bind.h" | 
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" | 
| 9 #include "base/callback_helpers.h" | 9 #include "base/callback_helpers.h" | 
| 10 #include "base/logging.h" | 10 #include "base/logging.h" | 
| 11 #include "crypto/secure_util.h" | 11 #include "crypto/secure_util.h" | 
| 12 #include "net/base/host_port_pair.h" | 12 #include "net/base/host_port_pair.h" | 
| 13 #include "net/base/io_buffer.h" | 13 #include "net/base/io_buffer.h" | 
| 14 #include "net/base/net_errors.h" | 14 #include "net/base/net_errors.h" | 
| 15 #include "net/cert/cert_status_flags.h" | 15 #include "net/cert/cert_status_flags.h" | 
| 16 #include "net/cert/cert_verifier.h" | 16 #include "net/cert/cert_verifier.h" | 
| 17 #include "net/cert/cert_verify_result.h" | 17 #include "net/cert/cert_verify_result.h" | 
| 18 #include "net/cert/x509_certificate.h" | 18 #include "net/cert/x509_certificate.h" | 
| 19 #include "net/http/transport_security_state.h" | 19 #include "net/http/transport_security_state.h" | 
| 20 #include "net/socket/client_socket_handle.h" | 20 #include "net/socket/client_socket_handle.h" | 
| 21 #include "net/socket/ssl_client_socket.h" | 21 #include "net/socket/ssl_client_socket.h" | 
| 22 #include "net/socket/ssl_server_socket.h" | 22 #include "net/socket/ssl_server_socket.h" | 
| 23 #include "net/ssl/ssl_config_service.h" | 23 #include "net/ssl/ssl_config_service.h" | 
| 24 #include "net/ssl/ssl_server_config.h" |  | 
| 25 #include "remoting/base/rsa_key_pair.h" | 24 #include "remoting/base/rsa_key_pair.h" | 
| 26 #include "remoting/protocol/auth_util.h" | 25 #include "remoting/protocol/auth_util.h" | 
| 27 #include "remoting/protocol/p2p_stream_socket.h" | 26 #include "remoting/protocol/p2p_stream_socket.h" | 
| 28 | 27 | 
| 29 #if defined(OS_NACL) | 28 #if defined(OS_NACL) | 
| 30 #include "net/socket/ssl_client_socket_openssl.h" | 29 #include "net/socket/ssl_client_socket_openssl.h" | 
| 31 #else | 30 #else | 
| 32 #include "net/socket/client_socket_factory.h" | 31 #include "net/socket/client_socket_factory.h" | 
| 33 #endif | 32 #endif | 
| 34 | 33 | 
| (...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 213 #else | 212 #else | 
| 214     scoped_refptr<net::X509Certificate> cert = | 213     scoped_refptr<net::X509Certificate> cert = | 
| 215         net::X509Certificate::CreateFromBytes( | 214         net::X509Certificate::CreateFromBytes( | 
| 216             local_cert_.data(), local_cert_.length()); | 215             local_cert_.data(), local_cert_.length()); | 
| 217     if (!cert.get()) { | 216     if (!cert.get()) { | 
| 218       LOG(ERROR) << "Failed to parse X509Certificate"; | 217       LOG(ERROR) << "Failed to parse X509Certificate"; | 
| 219       NotifyError(net::ERR_FAILED); | 218       NotifyError(net::ERR_FAILED); | 
| 220       return; | 219       return; | 
| 221     } | 220     } | 
| 222 | 221 | 
| 223     net::SSLServerConfig ssl_config; | 222     net::SSLConfig ssl_config; | 
| 224     ssl_config.require_ecdhe = true; | 223     ssl_config.require_ecdhe = true; | 
| 225 | 224 | 
| 226     scoped_ptr<net::SSLServerSocket> server_socket = net::CreateSSLServerSocket( | 225     scoped_ptr<net::SSLServerSocket> server_socket = net::CreateSSLServerSocket( | 
| 227         make_scoped_ptr(new NetStreamSocketAdapter(socket.Pass())), cert.get(), | 226         make_scoped_ptr(new NetStreamSocketAdapter(socket.Pass())), cert.get(), | 
| 228         local_key_pair_->private_key(), ssl_config); | 227         local_key_pair_->private_key(), ssl_config); | 
| 229     net::SSLServerSocket* raw_server_socket = server_socket.get(); | 228     net::SSLServerSocket* raw_server_socket = server_socket.get(); | 
| 230     socket_ = server_socket.Pass(); | 229     socket_ = server_socket.Pass(); | 
| 231     result = raw_server_socket->Handshake( | 230     result = raw_server_socket->Handshake( | 
| 232         base::Bind(&SslHmacChannelAuthenticator::OnConnected, | 231         base::Bind(&SslHmacChannelAuthenticator::OnConnected, | 
| 233                    base::Unretained(this))); | 232                    base::Unretained(this))); | 
| (...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 429              make_scoped_ptr(new P2PStreamSocketAdapter(socket_.Pass()))); | 428              make_scoped_ptr(new P2PStreamSocketAdapter(socket_.Pass()))); | 
| 430   } | 429   } | 
| 431 } | 430 } | 
| 432 | 431 | 
| 433 void SslHmacChannelAuthenticator::NotifyError(int error) { | 432 void SslHmacChannelAuthenticator::NotifyError(int error) { | 
| 434   base::ResetAndReturn(&done_callback_).Run(error, nullptr); | 433   base::ResetAndReturn(&done_callback_).Run(error, nullptr); | 
| 435 } | 434 } | 
| 436 | 435 | 
| 437 }  // namespace protocol | 436 }  // namespace protocol | 
| 438 }  // namespace remoting | 437 }  // namespace remoting | 
| OLD | NEW | 
|---|