net/quic/crypto/quic_crypto_server_config_test.cc - Issue 1411063004: Remove insecure QUIC support

Unified Diff: net/quic/crypto/quic_crypto_server_config_test.cc

Issue 1411063004: Remove insecure QUIC support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

« net/http/http_server_properties_manager_unittest.cc ('K') | « net/quic/crypto/quic_crypto_server_config.cc ('k') | net/quic/p2p/quic_p2p_session_test.cc » ('j') | net/tools/quic/end_to_end_test.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/quic/crypto/quic_crypto_server_config_test.cc

diff --git a/net/quic/crypto/quic_crypto_server_config_test.cc b/net/quic/crypto/quic_crypto_server_config_test.cc

index 4b0aa5a572264a122aa8d27b37d2389104cfd5d5..f28f7cd4894ef947b516641307210dfe5cfbe858 100644

--- a/net/quic/crypto/quic_crypto_server_config_test.cc

+++ b/net/quic/crypto/quic_crypto_server_config_test.cc

@@ -15,6 +15,7 @@

#include "net/quic/crypto/strike_register_client.h"

#include "net/quic/quic_flags.h"

#include "net/quic/quic_time.h"

+#include "net/quic/test_tools/crypto_test_utils.h"

#include "net/quic/test_tools/mock_clock.h"

#include "net/quic/test_tools/quic_test_utils.h"

#include "testing/gmock/include/gmock/gmock.h"

@@ -218,7 +219,8 @@ class TestStrikeRegisterClient : public StrikeRegisterClient {

TEST(QuicCryptoServerConfigTest, ServerConfig) {

QuicRandom* rand = QuicRandom::GetInstance();

- QuicCryptoServerConfig server(QuicCryptoServerConfig::TESTING, rand);

+ QuicCryptoServerConfig server(QuicCryptoServerConfig::TESTING, rand,

+ CryptoTestUtils::ProofSourceForTesting());

MockClock clock;

scoped_ptr<CryptoHandshakeMessage>(

@@ -228,7 +230,8 @@ TEST(QuicCryptoServerConfigTest, ServerConfig) {

TEST(QuicCryptoServerConfigTest, GetOrbitIsCalledWithoutTheStrikeRegisterLock) {

QuicRandom* rand = QuicRandom::GetInstance();

- QuicCryptoServerConfig server(QuicCryptoServerConfig::TESTING, rand);

+ QuicCryptoServerConfig server(QuicCryptoServerConfig::TESTING, rand,

+ CryptoTestUtils::ProofSourceForTesting());

MockClock clock;

TestStrikeRegisterClient* strike_register =

@@ -249,7 +252,8 @@ class SourceAddressTokenTest : public ::testing::Test {

ip6_(Loopback6()),

original_time_(QuicWallTime::Zero()),

rand_(QuicRandom::GetInstance()),

- server_(QuicCryptoServerConfig::TESTING, rand_),

+ server_(QuicCryptoServerConfig::TESTING, rand_,

+ CryptoTestUtils::ProofSourceForTesting()),

peer_(&server_) {

// Advance the clock to some non-zero time.

clock_.AdvanceTime(QuicTime::Delta::FromSeconds(1000000));

@@ -422,7 +426,8 @@ TEST_F(SourceAddressTokenTest, SourceAddressTokenMultipleAddresses) {

TEST(QuicCryptoServerConfigTest, ValidateServerNonce) {

QuicRandom* rand = QuicRandom::GetInstance();

- QuicCryptoServerConfig server(QuicCryptoServerConfig::TESTING, rand);

+ QuicCryptoServerConfig server(QuicCryptoServerConfig::TESTING, rand,

+ CryptoTestUtils::ProofSourceForTesting());

QuicCryptoServerConfigPeer peer(&server);

StringPiece message("hello world");

@@ -453,7 +458,8 @@ class CryptoServerConfigsTest : public ::testing::Test {

public:

CryptoServerConfigsTest()

: rand_(QuicRandom::GetInstance()),

- config_(QuicCryptoServerConfig::TESTING, rand_),

+ config_(QuicCryptoServerConfig::TESTING, rand_,

+ CryptoTestUtils::ProofSourceForTesting()),

test_peer_(&config_) {}

void SetUp() override {