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

Unified Diff: net/quic/test_tools/crypto_test_utils.cc

Issue 1397983007: relnote: remove insecure QUIC support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@rch_insecure_quic
Patch Set: Compile fix Created 5 years, 2 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
« no previous file with comments | « net/quic/test_tools/crypto_test_utils.h ('k') | net/quic/test_tools/crypto_test_utils_chromium.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/test_tools/crypto_test_utils.cc
diff --git a/net/quic/test_tools/crypto_test_utils.cc b/net/quic/test_tools/crypto_test_utils.cc
index 409a042bc358a290f95667ffd2d3324b8c399885..85ffd7919a7cc1e17b07e971b380248b2e49339e 100644
--- a/net/quic/test_tools/crypto_test_utils.cc
+++ b/net/quic/test_tools/crypto_test_utils.cc
@@ -167,10 +167,7 @@ class AsyncTestChannelIDSource : public ChannelIDSource,
} // anonymous namespace
CryptoTestUtils::FakeClientOptions::FakeClientOptions()
- : dont_verify_certs(false),
- channel_id_enabled(false),
- channel_id_source_async(false) {
-}
+ : channel_id_enabled(false), channel_id_source_async(false) {}
// static
int CryptoTestUtils::HandshakeWithFakeServer(
@@ -181,7 +178,8 @@ int CryptoTestUtils::HandshakeWithFakeServer(
QuicConfig config = DefaultQuicConfig();
QuicCryptoServerConfig crypto_config(QuicCryptoServerConfig::TESTING,
- QuicRandom::GetInstance());
+ QuicRandom::GetInstance(),
+ ProofSourceForTesting());
SetupCryptoServerConfigForTest(server_conn->clock(),
server_conn->random_generator(), &config,
&crypto_config);
@@ -193,7 +191,6 @@ int CryptoTestUtils::HandshakeWithFakeServer(
CommunicateHandshakeMessages(client_conn, client, server_conn,
server_session.GetCryptoStream());
-
CompareClientAndServerKeys(client, server_session.GetCryptoStream());
return client->num_sent_client_hellos();
@@ -210,7 +207,7 @@ int CryptoTestUtils::HandshakeWithFakeClient(
// Advance the time, because timers do not like uninitialized times.
client_conn->AdvanceTime(QuicTime::Delta::FromSeconds(1));
- QuicCryptoClientConfig crypto_config;
+ QuicCryptoClientConfig crypto_config(ProofVerifierForTesting());
AsyncTestChannelIDSource* async_channel_id_source = nullptr;
if (options.channel_id_enabled) {
@@ -221,14 +218,6 @@ int CryptoTestUtils::HandshakeWithFakeClient(
}
crypto_config.SetChannelIDSource(source);
}
- if (!options.dont_verify_certs && server_id.is_https()) {
-#if defined(USE_OPENSSL)
- crypto_config.SetProofVerifier(ProofVerifierForTesting());
-#else
- // TODO(rch): Implement a NSS proof source.
- crypto_config.SetProofVerifier(FakeProofVerifierForTesting());
-#endif
- }
TestQuicSpdyClientSession client_session(client_conn, DefaultQuicConfig(),
server_id, &crypto_config);
« no previous file with comments | « net/quic/test_tools/crypto_test_utils.h ('k') | net/quic/test_tools/crypto_test_utils_chromium.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698