| Index: net/tools/quic/quic_client_bin.cc
|
| diff --git a/net/tools/quic/quic_client_bin.cc b/net/tools/quic/quic_client_bin.cc
|
| index e00f1359f310364c0c31ce81f7ff2df601e687d9..771d747133cf0606a9dede8a155d5dd628a7b254 100644
|
| --- a/net/tools/quic/quic_client_bin.cc
|
| +++ b/net/tools/quic/quic_client_bin.cc
|
| @@ -66,6 +66,7 @@
|
|
|
| using base::StringPiece;
|
| using net::CertVerifier;
|
| +using net::ProofVerifier;
|
| using net::ProofVerifierChromium;
|
| using net::TransportSecurityState;
|
| using std::cout;
|
| @@ -208,23 +209,21 @@ int main(int argc, char *argv[]) {
|
| // Build the client, and try to connect.
|
| net::EpollServer epoll_server;
|
| net::QuicServerId server_id(url.host(), url.EffectiveIntPort(),
|
| - /*is_https=*/true, net::PRIVACY_MODE_DISABLED);
|
| + net::PRIVACY_MODE_DISABLED);
|
| net::QuicVersionVector versions = net::QuicSupportedVersions();
|
| if (FLAGS_quic_version != -1) {
|
| versions.clear();
|
| versions.push_back(static_cast<net::QuicVersion>(FLAGS_quic_version));
|
| }
|
| + scoped_ptr<CertVerifier> cert_verifier(CertVerifier::CreateDefault());
|
| + scoped_ptr<TransportSecurityState> transport_security_state(
|
| + new TransportSecurityState);
|
| + ProofVerifier* proof_verifier = new ProofVerifierChromium(
|
| + cert_verifier.get(), nullptr, transport_security_state.get());
|
| net::tools::QuicClient client(net::IPEndPoint(ip_addr, port), server_id,
|
| - versions, &epoll_server);
|
| - scoped_ptr<CertVerifier> cert_verifier;
|
| - scoped_ptr<TransportSecurityState> transport_security_state;
|
| + versions, &epoll_server, proof_verifier);
|
| client.set_initial_max_packet_length(
|
| FLAGS_initial_mtu != 0 ? FLAGS_initial_mtu : net::kDefaultMaxPacketSize);
|
| - // For secure QUIC we need to verify the cert chain.
|
| - cert_verifier = CertVerifier::CreateDefault();
|
| - transport_security_state.reset(new TransportSecurityState);
|
| - client.SetProofVerifier(new ProofVerifierChromium(
|
| - cert_verifier.get(), nullptr, transport_security_state.get()));
|
| if (!client.Initialize()) {
|
| cerr << "Failed to initialize client." << endl;
|
| return 1;
|
|
|