Land Recent QUIC changes.

Use example.com as test hostname.

Merge internal change: 46048925

Only updating the time of last packet once we've done our best to verify packet validity.

Merge internal change: 46044184

Improve logging behavior in quic_connection.h.

Merge internal change: 46033559

Moving the public flags to the beginning of the header in preparation for variable length guids.

Merge internal change: 45980153

QUIC: change the GCM tag size to 12 bytes.

Merge internal change: 45973625

QUIC: add some crypto tests.

The client code tries to be correct, which can hamper some tests that wish to
send invalid requests.

This CL contains some utilities for constructing arbitrary handshake messages
and some tests that exercise the server crypto code.

Merge internal change: 45972782

Not allowing retransmissions to affect client timeouts.  Fixes a serious
bug where if client vanishes and we have unacked packets, the connection
could live on forever.

Merge internal change: 45935953

Address wtc's comments on cl/44272981.

Merge internal change: 45917323

QUIC: don't CHECK when QUIC is enabled without any certificates loaded.

Without certificates we don't have any key material for the source-address
token nor server config and so QUIC isn't setup at server load time. However,
if QUIC is enabled anyway then it'll crash.

This change removes the CHECK and has every crypto handshake fail instead.

(I have tests for the recent SNI change pending, into which a test for this
will fall nicely, hopefully this afternoon. But I'm prioritising this change
for now rather than waiting for the test CL to land.)

Merge internal change: 45914344

Merging cleanup changes from chromium

Merge internal change: 45797529

QUIC: pad client hello messages and require padding on the server.

This reduces any amplification factor that an attacker might get from us. I've
picked a minimum size of 512 bytes out of thin air.

Satyam has a change pending that bumps the version to 2 so I've omitted that here.

Merge internal change: 45779287

QUIC: small fixes

* Don't send invalid SNIs as a client.
* Don't require an SNI as a server.
* Don't ignore client hello processing errors.

Merge internal change: 45774287

QUIC - set QUIC max stream per connections based on SNI.

Merge internal change: 45656436

- Enabled EndToEnd's Timeout unittest.
- Ported IsValidSNI and NormalizeHostname from internal code.

R=rch@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=201501

Review URL: https://chromiumcodereview.appspot.com/15385004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201674 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 8 deletions

diff --git a/net/quic/quic_crypto_server_stream_test.cc b/net/quic/quic_crypto_server_stream_test.cc
index 686bca7..2db0881 100644
--- a/net/quic/quic_crypto_server_stream_test.cc
+++ b/net/quic/quic_crypto_server_stream_test.cc
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
-#include "net/quic/crypto/aes_128_gcm_encrypter.h"
+#include "net/quic/crypto/aes_128_gcm_12_encrypter.h"
 #include "net/quic/crypto/crypto_framer.h"
 #include "net/quic/crypto/crypto_handshake.h"
 #include "net/quic/crypto/crypto_protocol.h"
@@ -103,7 +103,7 @@ class QuicCryptoServerStreamTest : public ::testing::Test {
 };
 
 TEST_F(QuicCryptoServerStreamTest, NotInitiallyConected) {
-  if (!Aes128GcmEncrypter::IsSupported()) {
+  if (!Aes128Gcm12Encrypter::IsSupported()) {
     LOG(INFO) << "AES GCM not supported. Test skipped.";
     return;
   }
@@ -113,7 +113,7 @@ TEST_F(QuicCryptoServerStreamTest, NotInitiallyConected) {
 }
 
 TEST_F(QuicCryptoServerStreamTest, ConnectedAfterCHLO) {
-  if (!Aes128GcmEncrypter::IsSupported()) {
+  if (!Aes128Gcm12Encrypter::IsSupported()) {
     LOG(INFO) << "AES GCM not supported. Test skipped.";
     return;
   }
@@ -132,7 +132,7 @@ TEST_F(QuicCryptoServerStreamTest, ConnectedAfterCHLO) {
 }
 
 TEST_F(QuicCryptoServerStreamTest, ZeroRTT) {
-  if (!Aes128GcmEncrypter::IsSupported()) {
+  if (!Aes128Gcm12Encrypter::IsSupported()) {
     LOG(INFO) << "AES GCM not supported. Test skipped.";
     return;
   }
@@ -186,7 +186,7 @@ TEST_F(QuicCryptoServerStreamTest, ZeroRTT) {
 
   // This causes the client's nonce to be different and thus stops the
   // strike-register from rejecting the repeated nonce.
-  client_conn->random_generator()->Reseed(NULL, 0);
+  reinterpret_cast<MockRandom*>(client_conn->random_generator())->ChangeValue();
   client_session.reset(new TestSession(client_conn, client_config, false));
   server_session.reset(new TestSession(server_conn, config_, true));
   client.reset(new QuicCryptoClientStream(
@@ -205,7 +205,7 @@ TEST_F(QuicCryptoServerStreamTest, ZeroRTT) {
 }
 
 TEST_F(QuicCryptoServerStreamTest, MessageAfterHandshake) {
-  if (!Aes128GcmEncrypter::IsSupported()) {
+  if (!Aes128Gcm12Encrypter::IsSupported()) {
     LOG(INFO) << "AES GCM not supported. Test skipped.";
     return;
   }
@@ -219,7 +219,7 @@ TEST_F(QuicCryptoServerStreamTest, MessageAfterHandshake) {
 }
 
 TEST_F(QuicCryptoServerStreamTest, BadMessageType) {
-  if (!Aes128GcmEncrypter::IsSupported()) {
+  if (!Aes128Gcm12Encrypter::IsSupported()) {
     LOG(INFO) << "AES GCM not supported. Test skipped.";
     return;
   }
@@ -232,7 +232,7 @@ TEST_F(QuicCryptoServerStreamTest, BadMessageType) {
 }
 
 TEST_F(QuicCryptoServerStreamTest, WithoutCertificates) {
-  if (!Aes128GcmEncrypter::IsSupported()) {
+  if (!Aes128Gcm12Encrypter::IsSupported()) {
     LOG(INFO) << "AES GCM not supported. Test skipped.";
     return;
   }