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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/quic/core/crypto/crypto_server_test.cc

Issue 2671333004: Convert class-full-of-statics CryptoTestUtils into a namespace (Closed)
Patch Set: Created 3 years, 10 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/core/crypto/crypto_framer_test.cc ('k') | net/quic/core/crypto/quic_crypto_client_config_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/core/crypto/crypto_server_test.cc
diff --git a/net/quic/core/crypto/crypto_server_test.cc b/net/quic/core/crypto/crypto_server_test.cc
index 9776deb7462a329357f2f51b7f244cb470f4c3d1..befd5c673415bbc9675c3cb23ccf0af7b22b0ca9 100644
--- a/net/quic/core/crypto/crypto_server_test.cc
+++ b/net/quic/core/crypto/crypto_server_test.cc
@@ -107,7 +107,7 @@ class CryptoServerTest : public ::testing::TestWithParam<TestParams> {
client_address_(QuicIpAddress::Loopback4(), 1234),
config_(QuicCryptoServerConfig::TESTING,
rand_,
- CryptoTestUtils::ProofSourceForTesting()),
+ crypto_test_utils::ProofSourceForTesting()),
peer_(&config_),
compressed_certs_cache_(
QuicCompressedCertsCache::kQuicCompressedCertsCacheSize),
@@ -150,7 +150,7 @@ class CryptoServerTest : public ::testing::TestWithParam<TestParams> {
"#" + QuicTextUtils::HexEncode(public_value, sizeof(public_value));
// clang-format off
- CryptoHandshakeMessage client_hello = CryptoTestUtils::Message(
+ CryptoHandshakeMessage client_hello = crypto_test_utils::Message(
"CHLO",
"PDMD", "X509",
"AEAD", "AESG",
@@ -386,7 +386,7 @@ class CryptoServerTest : public ::testing::TestWithParam<TestParams> {
}
string XlctHexString() {
- uint64_t xlct = CryptoTestUtils::LeafCertHashForTesting();
+ uint64_t xlct = crypto_test_utils::LeafCertHashForTesting();
return "#" + QuicTextUtils::HexEncode(reinterpret_cast<char*>(&xlct),
sizeof(xlct));
}
@@ -435,7 +435,7 @@ TEST_P(CryptoServerTest, BadSNI) {
for (size_t i = 0; i < arraysize(kBadSNIs); i++) {
// clang-format off
- CryptoHandshakeMessage msg = CryptoTestUtils::Message(
+ CryptoHandshakeMessage msg = crypto_test_utils::Message(
"CHLO",
"PDMD", "X509",
"SNI", kBadSNIs[i],
@@ -455,7 +455,7 @@ TEST_P(CryptoServerTest, DefaultCert) {
// specified. The CHLO is constructed to generate a REJ with certs, so must
// not contain a valid STK, and must include PDMD.
// clang-format off
- CryptoHandshakeMessage msg = CryptoTestUtils::Message(
+ CryptoHandshakeMessage msg = crypto_test_utils::Message(
"CHLO",
"AEAD", "AESG",
"KEXS", "C255",
@@ -484,7 +484,7 @@ TEST_P(CryptoServerTest, RejectTooLarge) {
// Check that the server replies with no certificate when a CHLO is
// constructed with a PDMD but no SKT when the REJ would be too large.
// clang-format off
- CryptoHandshakeMessage msg = CryptoTestUtils::Message(
+ CryptoHandshakeMessage msg = crypto_test_utils::Message(
"CHLO",
"PDMD", "X509",
"AEAD", "AESG",
@@ -515,7 +515,7 @@ TEST_P(CryptoServerTest, RejectNotTooLarge) {
chlo_packet_size_ *= 2;
// clang-format off
- CryptoHandshakeMessage msg = CryptoTestUtils::Message(
+ CryptoHandshakeMessage msg = crypto_test_utils::Message(
"CHLO",
"PDMD", "X509",
"AEAD", "AESG",
@@ -545,7 +545,7 @@ TEST_P(CryptoServerTest, RejectTooLargeButValidSTK) {
// Check that the server replies with no certificate when a CHLO is
// constructed with a PDMD but no SKT when the REJ would be too large.
// clang-format off
- CryptoHandshakeMessage msg = CryptoTestUtils::Message(
+ CryptoHandshakeMessage msg = crypto_test_utils::Message(
"CHLO",
"PDMD", "X509",
"AEAD", "AESG",
@@ -576,7 +576,7 @@ TEST_P(CryptoServerTest, RejectTooLargeButValidSTK) {
TEST_P(CryptoServerTest, TooSmall) {
// clang-format off
- ShouldFailMentioning("too small", CryptoTestUtils::Message(
+ ShouldFailMentioning("too small", crypto_test_utils::Message(
"CHLO",
"PDMD", "X509",
"VER\0", client_version_string_.c_str(),
@@ -600,7 +600,7 @@ TEST_P(CryptoServerTest, BadSourceAddressToken) {
for (size_t i = 0; i < arraysize(kBadSourceAddressTokens); i++) {
// clang-format off
- CryptoHandshakeMessage msg = CryptoTestUtils::Message(
+ CryptoHandshakeMessage msg = crypto_test_utils::Message(
"CHLO",
"PDMD", "X509",
"STK", kBadSourceAddressTokens[i],
@@ -626,7 +626,7 @@ TEST_P(CryptoServerTest, BadClientNonce) {
for (size_t i = 0; i < arraysize(kBadNonces); i++) {
// Invalid nonces should be ignored, in an inchoate CHLO.
// clang-format off
- CryptoHandshakeMessage msg = CryptoTestUtils::Message(
+ CryptoHandshakeMessage msg = crypto_test_utils::Message(
"CHLO",
"PDMD", "X509",
"NONC", kBadNonces[i],
@@ -641,7 +641,7 @@ TEST_P(CryptoServerTest, BadClientNonce) {
// Invalid nonces should result in CLIENT_NONCE_INVALID_FAILURE.
// clang-format off
- CryptoHandshakeMessage msg1 = CryptoTestUtils::Message(
+ CryptoHandshakeMessage msg1 = crypto_test_utils::Message(
"CHLO",
"PDMD", "X509",
"AEAD", "AESG",
@@ -669,7 +669,7 @@ TEST_P(CryptoServerTest, BadClientNonce) {
TEST_P(CryptoServerTest, NoClientNonce) {
// No client nonces should result in INCHOATE_HELLO_FAILURE.
// clang-format off
- CryptoHandshakeMessage msg = CryptoTestUtils::Message(
+ CryptoHandshakeMessage msg = crypto_test_utils::Message(
"CHLO",
"PDMD", "X509",
"VER\0", client_version_string_.c_str(),
@@ -683,7 +683,7 @@ TEST_P(CryptoServerTest, NoClientNonce) {
CheckRejectReasons(kRejectReasons, arraysize(kRejectReasons));
// clang-format off
- CryptoHandshakeMessage msg1 = CryptoTestUtils::Message(
+ CryptoHandshakeMessage msg1 = crypto_test_utils::Message(
"CHLO",
"PDMD", "X509",
"AEAD", "AESG",
@@ -715,7 +715,7 @@ TEST_P(CryptoServerTest, DowngradeAttack) {
QuicTagToString(QuicVersionToQuicTag(supported_versions_.back()));
// clang-format off
- CryptoHandshakeMessage msg = CryptoTestUtils::Message(
+ CryptoHandshakeMessage msg = crypto_test_utils::Message(
"CHLO",
"PDMD", "X509",
"VER\0", bad_version.c_str(),
@@ -731,7 +731,7 @@ TEST_P(CryptoServerTest, DowngradeAttack) {
TEST_P(CryptoServerTest, CorruptServerConfig) {
// This tests corrupted server config.
// clang-format off
- CryptoHandshakeMessage msg = CryptoTestUtils::Message(
+ CryptoHandshakeMessage msg = crypto_test_utils::Message(
"CHLO",
"PDMD", "X509",
"AEAD", "AESG",
@@ -754,7 +754,7 @@ TEST_P(CryptoServerTest, CorruptServerConfig) {
TEST_P(CryptoServerTest, CorruptSourceAddressToken) {
// This tests corrupted source address token.
// clang-format off
- CryptoHandshakeMessage msg = CryptoTestUtils::Message(
+ CryptoHandshakeMessage msg = crypto_test_utils::Message(
"CHLO",
"PDMD", "X509",
"AEAD", "AESG",
@@ -778,7 +778,7 @@ TEST_P(CryptoServerTest, CorruptSourceAddressToken) {
TEST_P(CryptoServerTest, CorruptClientNonceAndSourceAddressToken) {
// This test corrupts client nonce and source address token.
// clang-format off
- CryptoHandshakeMessage msg = CryptoTestUtils::Message(
+ CryptoHandshakeMessage msg = crypto_test_utils::Message(
"CHLO",
"PDMD", "X509",
"AEAD", "AESG",
@@ -802,7 +802,7 @@ TEST_P(CryptoServerTest, CorruptClientNonceAndSourceAddressToken) {
TEST_P(CryptoServerTest, CorruptMultipleTags) {
// This test corrupts client nonce, server nonce and source address token.
// clang-format off
- CryptoHandshakeMessage msg = CryptoTestUtils::Message(
+ CryptoHandshakeMessage msg = crypto_test_utils::Message(
"CHLO",
"PDMD", "X509",
"AEAD", "AESG",
@@ -830,7 +830,7 @@ TEST_P(CryptoServerTest, NoServerNonce) {
// When no server nonce is present and no strike register is configured,
// the CHLO should be rejected.
// clang-format off
- CryptoHandshakeMessage msg = CryptoTestUtils::Message(
+ CryptoHandshakeMessage msg = crypto_test_utils::Message(
"CHLO",
"PDMD", "X509",
"AEAD", "AESG",
@@ -857,7 +857,7 @@ TEST_P(CryptoServerTest, NoServerNonce) {
TEST_P(CryptoServerTest, ProofForSuppliedServerConfig) {
client_address_ = QuicSocketAddress(QuicIpAddress::Loopback6(), 1234);
// clang-format off
- CryptoHandshakeMessage msg = CryptoTestUtils::Message(
+ CryptoHandshakeMessage msg = crypto_test_utils::Message(
"CHLO",
"AEAD", "AESG",
"KEXS", "C255",
@@ -900,9 +900,9 @@ TEST_P(CryptoServerTest, ProofForSuppliedServerConfig) {
// Check that the proof in the REJ message is valid.
std::unique_ptr<ProofVerifier> proof_verifier(
- CryptoTestUtils::ProofVerifierForTesting());
+ crypto_test_utils::ProofVerifierForTesting());
std::unique_ptr<ProofVerifyContext> verify_context(
- CryptoTestUtils::ProofVerifyContextForTesting());
+ crypto_test_utils::ProofVerifyContextForTesting());
std::unique_ptr<ProofVerifyDetails> details;
string error_details;
std::unique_ptr<ProofVerifierCallback> callback(
@@ -918,7 +918,7 @@ TEST_P(CryptoServerTest, ProofForSuppliedServerConfig) {
TEST_P(CryptoServerTest, RejectInvalidXlct) {
// clang-format off
- CryptoHandshakeMessage msg = CryptoTestUtils::Message(
+ CryptoHandshakeMessage msg = crypto_test_utils::Message(
"CHLO",
"PDMD", "X509",
"AEAD", "AESG",
@@ -948,7 +948,7 @@ TEST_P(CryptoServerTest, RejectInvalidXlct) {
TEST_P(CryptoServerTest, ValidXlct) {
// clang-format off
- CryptoHandshakeMessage msg = CryptoTestUtils::Message(
+ CryptoHandshakeMessage msg = crypto_test_utils::Message(
"CHLO",
"PDMD", "X509",
"AEAD", "AESG",
@@ -973,7 +973,7 @@ TEST_P(CryptoServerTest, ValidXlct) {
TEST_P(CryptoServerTest, NonceInSHLO) {
// clang-format off
- CryptoHandshakeMessage msg = CryptoTestUtils::Message(
+ CryptoHandshakeMessage msg = crypto_test_utils::Message(
"CHLO",
"PDMD", "X509",
"AEAD", "AESG",
@@ -1004,7 +1004,7 @@ TEST_P(CryptoServerTest, ProofSourceFailure) {
peer_.ResetProofSource(std::unique_ptr<ProofSource>(new FailingProofSource));
// clang-format off
- CryptoHandshakeMessage msg = CryptoTestUtils::Message(
+ CryptoHandshakeMessage msg = crypto_test_utils::Message(
"CHLO",
"AEAD", "AESG",
"KEXS", "C255",
@@ -1030,9 +1030,9 @@ TEST(CryptoServerConfigGenerationTest, Determinism) {
MockClock clock;
QuicCryptoServerConfig a(QuicCryptoServerConfig::TESTING, &rand_a,
- CryptoTestUtils::ProofSourceForTesting());
+ crypto_test_utils::ProofSourceForTesting());
QuicCryptoServerConfig b(QuicCryptoServerConfig::TESTING, &rand_b,
- CryptoTestUtils::ProofSourceForTesting());
+ crypto_test_utils::ProofSourceForTesting());
std::unique_ptr<CryptoHandshakeMessage> scfg_a(
a.AddDefaultConfig(&rand_a, &clock, options));
std::unique_ptr<CryptoHandshakeMessage> scfg_b(
@@ -1050,10 +1050,10 @@ TEST(CryptoServerConfigGenerationTest, SCIDVaries) {
MockClock clock;
QuicCryptoServerConfig a(QuicCryptoServerConfig::TESTING, &rand_a,
- CryptoTestUtils::ProofSourceForTesting());
+ crypto_test_utils::ProofSourceForTesting());
rand_b.ChangeValue();
QuicCryptoServerConfig b(QuicCryptoServerConfig::TESTING, &rand_b,
- CryptoTestUtils::ProofSourceForTesting());
+ crypto_test_utils::ProofSourceForTesting());
std::unique_ptr<CryptoHandshakeMessage> scfg_a(
a.AddDefaultConfig(&rand_a, &clock, options));
std::unique_ptr<CryptoHandshakeMessage> scfg_b(
@@ -1072,7 +1072,7 @@ TEST(CryptoServerConfigGenerationTest, SCIDIsHashOfServerConfig) {
MockClock clock;
QuicCryptoServerConfig a(QuicCryptoServerConfig::TESTING, &rand_a,
- CryptoTestUtils::ProofSourceForTesting());
+ crypto_test_utils::ProofSourceForTesting());
std::unique_ptr<CryptoHandshakeMessage> scfg(
a.AddDefaultConfig(&rand_a, &clock, options));
@@ -1103,7 +1103,7 @@ class CryptoServerTestNoConfig : public CryptoServerTest {
TEST_P(CryptoServerTestNoConfig, DontCrash) {
// clang-format off
- CryptoHandshakeMessage msg = CryptoTestUtils::Message(
+ CryptoHandshakeMessage msg = crypto_test_utils::Message(
"CHLO",
"PDMD", "X509",
"VER\0", client_version_string_.c_str(),
@@ -1129,7 +1129,7 @@ class CryptoServerTestOldVersion : public CryptoServerTest {
TEST_P(CryptoServerTestOldVersion, ServerIgnoresXlct) {
// clang-format off
- CryptoHandshakeMessage msg = CryptoTestUtils::Message(
+ CryptoHandshakeMessage msg = crypto_test_utils::Message(
"CHLO",
"PDMD", "X509",
"AEAD", "AESG",
@@ -1154,7 +1154,7 @@ TEST_P(CryptoServerTestOldVersion, ServerIgnoresXlct) {
TEST_P(CryptoServerTestOldVersion, XlctNotRequired) {
// clang-format off
- CryptoHandshakeMessage msg = CryptoTestUtils::Message(
+ CryptoHandshakeMessage msg = crypto_test_utils::Message(
"CHLO",
"PDMD", "X509",
"AEAD", "AESG",
« no previous file with comments | « net/quic/core/crypto/crypto_framer_test.cc ('k') | net/quic/core/crypto/quic_crypto_client_config_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698