Roll src/net/third_party/quiche/src/ f08778a58..d5d13c2a8 (20 commits)
https://quiche.googlesource.com/quiche.git/+log/f08778a58e71..d5d13c2a81b5
$ git log f08778a58..d5d13c2a8 --date=short --no-merges --format='%ad %ae %s'
2019-03-18 rch Use std::string instead of string in a few places in QUIC to permit chrome merge.
2019-03-18 quiche-dev Add a Context class to simplify ProcessClientHello
2019-03-18 quiche-dev Change some methods in QuicSpdyStream from public to protected.
2019-03-17 quiche-dev gfe-relnote: In QUIC, validate packet number post decryption. Protected by quic_validate_packet_number_post_decryption.
2019-03-16 bnc Improve handing of frames with empty payload in HttpDecoder.
2019-03-15 quiche-dev Rename ENCRYPTION_NONE to ENCRYPTION_INITIAL
2019-03-15 quiche-dev Remove an unused argument
2019-03-15 quiche-dev Make ClientDemandsX509Proof a free function
2019-03-15 quiche-dev gfe-relnote: In QUIC, put packet number validation in a standalone function. No functional refactoring change. Not protected.
2019-03-15 quiche-dev gfe-relnote: In QUIC, add unused HANDSHAKE encryption level. No functional change expected, not protected.
2019-03-15 quiche-dev Remove an unused asynchronous jump
2019-03-15 quiche-dev Make CryptoUtils::HashHandshakeMessage return by value
2019-03-14 quiche-dev Uniquify QuicCryptoServerConfig::Add[Default]Config
2019-03-14 quiche-dev Remove unused arguments
2019-03-14 quiche-dev Allow variable length connection IDs in v99
2019-03-14 bnc Minor QuicSimpleServerSessionServerPushTest refactor.
2019-03-14 quiche-dev Split KeyExchange into synchronous and asynchronous variants
2019-03-14 quiche-dev Uniquify ChannelIDSource handling
2019-03-14 quiche-dev Fix a msan error because of uninitialized test diversification nonce.
2019-03-14 quiche-dev Convert CryptoFramer::ConstructHandshakeMessage to return unique_ptr
Created with:
roll-dep src/net/third_party/quiche/src
Roll src/third_party/quic_trace/src/ fe1b25874..9aaca5b48 (22 commits)
https://chromium.googlesource.com/external/github.com/google/quic-trace.git/+log/fe1b2587410c..9aaca5b4862a
$ git log fe1b25874..9aaca5b48 --date=short --no-merges --format='%ad %ae %s'
2019-03-18 rch In QUIC, add unused HANDSHAKE encryption level.
2019-03-13 vasilvv Update quic_trace to use a more recent version of protobuf
2019-02-20 jri.ietf Show offsets for STREAM frames
2019-01-10 vasilvv Add missing dependencies
2019-01-10 vasilvv Migrate quic_trace to use Swisstable
2019-01-09 vasilvv Sort events in the trace before processing it
2018-12-28 vasilvv Reduce the nesting in the code by reordering clauses
2018-12-12 vasilvv Add a support for JSON representation of the trace.
2018-10-30 vasilvv Update glew code
2018-08-25 vasilvv Add fields to mark TLPs and RTOs
2018-09-10 vasilvv Update documentation and add an example trace (#4)
2018-09-10 vasilvv Add high-DPI support for Linux and OS X
2018-09-06 vasilvv Clean up the logic for rescaling the trace
2018-09-07 vasilvv Add support for Mac OS X
2018-09-07 vasilvv Minor C++ cleanups required to build the renderer on OS X
2018-09-07 vasilvv Ensure trace renderer is compatible with OpenGL 3.3 core
2018-09-05 vasilvv Make freetype statically linked
2018-09-05 vasilvv Fix GL_KHR_debug feature check
2018-09-05 vasilvv Add .gitignore
2018-09-05 vasilvv Remove a leftover LOG line that's normally not useful
2018-09-05 vasilvv Make certain implicit dependencies explicit
2018-09-05 vasilvv Initial export of OpenGL-based QUIC trace renderer
Created with:
roll-dep src/third_party/quic_trace/src
Change-Id: I287edfd9be3c002d16f9db4e709af19828475edc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1529635
Auto-Submit: Ryan Hamilton <[email protected]>
Reviewed-by: Nick Harper <[email protected]>
Commit-Queue: Ryan Hamilton <[email protected]>
Cr-Commit-Position: refs/heads/master@{#642118}diff --git a/net/quic/quic_test_packet_maker.cc b/net/quic/quic_test_packet_maker.cc
index ab7dffa3..7c3e6dd 100644
--- a/net/quic/quic_test_packet_maker.cc
+++ b/net/quic/quic_test_packet_maker.cc
@@ -102,7 +102,7 @@
payloads, true, encryption_level_);
}
size_t encrypted_size = framer.EncryptInPlace(
- quic::ENCRYPTION_NONE, header.packet_number,
+ quic::ENCRYPTION_INITIAL, header.packet_number,
GetStartOfEncryptedData(framer.transport_version(), header), length,
quic::kDefaultMaxPacketSize, buffer);
EXPECT_EQ(quic::kDefaultMaxPacketSize, encrypted_size);
@@ -138,7 +138,7 @@
std::unique_ptr<quic::QuicReceivedPacket>
QuicTestPacketMaker::MakeDummyCHLOPacket(uint64_t packet_num) {
- SetEncryptionLevel(quic::ENCRYPTION_NONE);
+ SetEncryptionLevel(quic::ENCRYPTION_INITIAL);
InitializeHeader(packet_num, /*include_version=*/true);
quic::CryptoHandshakeMessage message =
@@ -156,8 +156,8 @@
frames.push_back(quic::QuicFrame(frame));
} else {
crypto_frame =
- quic::QuicCryptoFrame(quic::ENCRYPTION_NONE, 0, data.length());
- producer.SaveCryptoData(quic::ENCRYPTION_NONE, 0, data.AsStringPiece());
+ quic::QuicCryptoFrame(quic::ENCRYPTION_INITIAL, 0, data.length());
+ producer.SaveCryptoData(quic::ENCRYPTION_INITIAL, 0, data.AsStringPiece());
frames.push_back(quic::QuicFrame(&crypto_frame));
producer_p = &producer;
}
@@ -703,7 +703,7 @@
quic::test::BuildUnsizedDataPacket(&framer, header, frames));
char buffer[quic::kMaxPacketSize];
size_t encrypted_size =
- framer.EncryptPayload(quic::ENCRYPTION_NONE, header.packet_number,
+ framer.EncryptPayload(quic::ENCRYPTION_INITIAL, header.packet_number,
*packet, buffer, quic::kMaxPacketSize);
EXPECT_NE(0u, encrypted_size);
quic::QuicReceivedPacket encrypted(buffer, encrypted_size, clock_->Now(),
@@ -1200,7 +1200,7 @@
&framer, header, frames, max_plaintext_size));
char buffer[quic::kMaxPacketSize];
size_t encrypted_size =
- framer.EncryptPayload(quic::ENCRYPTION_NONE, header.packet_number,
+ framer.EncryptPayload(quic::ENCRYPTION_INITIAL, header.packet_number,
*packet, buffer, quic::kMaxPacketSize);
EXPECT_NE(0u, encrypted_size);
quic::QuicReceivedPacket encrypted(buffer, encrypted_size, clock_->Now(),
@@ -1346,7 +1346,7 @@
void QuicTestPacketMaker::SetEncryptionLevel(quic::EncryptionLevel level) {
encryption_level_ = level;
switch (level) {
- case quic::ENCRYPTION_NONE:
+ case quic::ENCRYPTION_INITIAL:
long_header_type_ = quic::INITIAL;
break;
case quic::ENCRYPTION_ZERO_RTT:
