Land Recent QUIC Changes

net/quic/crypto/crypto_framer_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <map>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/quic/crypto/crypto_framer.h"
@@ skipping 53 matching lines @@
   message.set_tag(0xFFAA7733);
   message.SetStringPiece(0x12345678, "abcdef");
   message.SetStringPiece(0x12345679, "ghijk");
   message.SetStringPiece(0x1234567A, "lmnopqr");
 
   unsigned char packet[] = {
     // tag
     0x33, 0x77, 0xAA, 0xFF,
     // num entries
     0x03, 0x00,
+    // padding
+    0x00, 0x00,
     // tag 1
     0x78, 0x56, 0x34, 0x12,
+    // end offset 1
+    0x06, 0x00, 0x00, 0x00,
     // tag 2
     0x79, 0x56, 0x34, 0x12,
+    // end offset 2
+    0x0b, 0x00, 0x00, 0x00,
     // tag 3
     0x7A, 0x56, 0x34, 0x12,
-    // len 1
-    0x06, 0x00,
-    // len 2
-    0x05, 0x00,
-    // len 3
-    0x07, 0x00,
-    // padding
-    0x00, 0x00,
+    // end offset 3
+    0x12, 0x00, 0x00, 0x00,
     // value 1
     'a',  'b',  'c',  'd',
     'e',  'f',
     // value 2
     'g',  'h',  'i',  'j',
     'k',
     // value 3
     'l',  'm',  'n',  'o',
     'p',  'q',  'r',
   };
@@ skipping 10 matching lines @@
   CryptoHandshakeMessage message;
   message.set_tag(0xFFAA7733);
   message.SetStringPiece(0x12345678, "abcdef");
   message.SetStringPiece(0x12345679, "ghijk");
 
   unsigned char packet[] = {
     // tag
     0x33, 0x77, 0xAA, 0xFF,
     // num entries
     0x02, 0x00,
+    // padding
+    0x00, 0x00,
     // tag 1
     0x78, 0x56, 0x34, 0x12,
+    // end offset 1
+    0x06, 0x00, 0x00, 0x00,
     // tag 2
     0x79, 0x56, 0x34, 0x12,
-    // len 1
-    0x06, 0x00,
-    // len 2
-    0x05, 0x00,
+    // end offset 2
+    0x0b, 0x00, 0x00, 0x00,
     // value 1
     'a',  'b',  'c',  'd',
     'e',  'f',
     // value 2
     'g',  'h',  'i',  'j',
     'k',
   };
 
   CryptoFramer framer;
   scoped_ptr<QuicData> data(framer.ConstructHandshakeMessage(message));
   ASSERT_TRUE(data.get() != NULL);
 
   test::CompareCharArraysWithHexError("constructed packet", data->data(),
                                       data->length(), AsChars(packet),
                                       arraysize(packet));
 }
 
 TEST(CryptoFramerTest, ConstructHandshakeMessageZeroLength) {
   CryptoHandshakeMessage message;
   message.set_tag(0xFFAA7733);
   message.SetStringPiece(0x12345678, "");
 
   unsigned char packet[] = {
     // tag
     0x33, 0x77, 0xAA, 0xFF,
     // num entries
     0x01, 0x00,
+    // padding
+    0x00, 0x00,
     // tag 1
     0x78, 0x56, 0x34, 0x12,
-    // len 1
-    0x00, 0x00,
-    // padding
-    0x00, 0x00,
+    // end offset 1
+    0x00, 0x00, 0x00, 0x00,
   };
 
   CryptoFramer framer;
   scoped_ptr<QuicData> data(framer.ConstructHandshakeMessage(message));
   ASSERT_TRUE(data.get() != NULL);
 
   test::CompareCharArraysWithHexError("constructed packet", data->data(),
                                       data->length(), AsChars(packet),
                                       arraysize(packet));
 }
@@ skipping 13 matching lines @@
 TEST(CryptoFramerTest, ProcessInput) {
   test::TestCryptoVisitor visitor;
   CryptoFramer framer;
   framer.set_visitor(&visitor);
 
   unsigned char input[] = {
     // tag
     0x33, 0x77, 0xAA, 0xFF,
     // num entries
     0x02, 0x00,
+    // padding
+    0x00, 0x00,
     // tag 1
     0x78, 0x56, 0x34, 0x12,
+    // end offset 1
+    0x06, 0x00, 0x00, 0x00,
     // tag 2
     0x79, 0x56, 0x34, 0x12,
-    // len 1
-    0x06, 0x00,
-    // len 2
-    0x05, 0x00,
+    // end offset 2
+    0x0b, 0x00, 0x00, 0x00,
     // value 1
     'a',  'b',  'c',  'd',
     'e',  'f',
     // value 2
     'g',  'h',  'i',  'j',
     'k',
   };
 
   EXPECT_TRUE(
       framer.ProcessInput(StringPiece(AsChars(input), arraysize(input))));
   EXPECT_EQ(0u, framer.InputBytesRemaining());
   ASSERT_EQ(1u, visitor.messages_.size());
   const CryptoHandshakeMessage& message = visitor.messages_[0];
   EXPECT_EQ(0xFFAA7733, message.tag());
   EXPECT_EQ(2u, message.tag_value_map().size());
   EXPECT_EQ("abcdef", CryptoTestUtils::GetValueForTag(message, 0x12345678));
   EXPECT_EQ("ghijk", CryptoTestUtils::GetValueForTag(message, 0x12345679));
 }
 
 TEST(CryptoFramerTest, ProcessInputWithThreeKeys) {
   test::TestCryptoVisitor visitor;
   CryptoFramer framer;
   framer.set_visitor(&visitor);
 
   unsigned char input[] = {
     // tag
     0x33, 0x77, 0xAA, 0xFF,
     // num entries
     0x03, 0x00,
+    // padding
+    0x00, 0x00,
     // tag 1
     0x78, 0x56, 0x34, 0x12,
+    // end offset 1
+    0x06, 0x00, 0x00, 0x00,
     // tag 2
     0x79, 0x56, 0x34, 0x12,
+    // end offset 2
+    0x0b, 0x00, 0x00, 0x00,
     // tag 3
     0x7A, 0x56, 0x34, 0x12,
-    // len 1
-    0x06, 0x00,
-    // len 2
-    0x05, 0x00,
-    // len 3
-    0x07, 0x00,
-    // padding
-    0x00, 0x00,
+    // end offset 3
+    0x12, 0x00, 0x00, 0x00,
     // value 1
     'a',  'b',  'c',  'd',
     'e',  'f',
     // value 2
     'g',  'h',  'i',  'j',
     'k',
     // value 3
     'l',  'm',  'n',  'o',
     'p',  'q',  'r',
   };
@@ skipping 13 matching lines @@
 TEST(CryptoFramerTest, ProcessInputIncrementally) {
   test::TestCryptoVisitor visitor;
   CryptoFramer framer;
   framer.set_visitor(&visitor);
 
   unsigned char input[] = {
     // tag
     0x33, 0x77, 0xAA, 0xFF,
     // num entries
     0x02, 0x00,
+    // padding
+    0x00, 0x00,
     // tag 1
     0x78, 0x56, 0x34, 0x12,
+    // end offset 1
+    0x06, 0x00, 0x00, 0x00,
     // tag 2
     0x79, 0x56, 0x34, 0x12,
-    // len 1
-    0x06, 0x00,
-    // len 2
-    0x05, 0x00,
+    // end offset 2
+    0x0b, 0x00, 0x00, 0x00,
     // value 1
     'a',  'b',  'c',  'd',
     'e',  'f',
     // value 2
     'g',  'h',  'i',  'j',
     'k',
   };
 
   for (size_t i = 0; i < arraysize(input); i++) {
     EXPECT_TRUE(framer.ProcessInput(StringPiece(AsChars(input) + i, 1)));
@@ skipping 10 matching lines @@
 TEST(CryptoFramerTest, ProcessInputTagsOutOfOrder) {
   test::TestCryptoVisitor visitor;
   CryptoFramer framer;
   framer.set_visitor(&visitor);
 
   unsigned char input[] = {
     // tag
     0x33, 0x77, 0xAA, 0xFF,
     // num entries
     0x02, 0x00,
+    // padding
+    0x00, 0x00,
     // tag 1
     0x78, 0x56, 0x34, 0x13,
+    // end offset 1
+    0x01, 0x00, 0x00, 0x00,
     // tag 2
     0x79, 0x56, 0x34, 0x12,
+    // end offset 2
+    0x02, 0x00, 0x00, 0x00,
   };
 
   EXPECT_FALSE(
       framer.ProcessInput(StringPiece(AsChars(input), arraysize(input))));
   EXPECT_EQ(QUIC_CRYPTO_TAGS_OUT_OF_ORDER, framer.error());
 }
 
-TEST(CryptoFramerTest, ProcessInputTooManyEntries) {
+TEST(CryptoFramerTest, ProcessEndOffsetsOutOfOrder) {
   test::TestCryptoVisitor visitor;
   CryptoFramer framer;
   framer.set_visitor(&visitor);
 
   unsigned char input[] = {
     // tag
     0x33, 0x77, 0xAA, 0xFF,
     // num entries
-    0xA0, 0x00,
+    0x02, 0x00,
+    // padding
+    0x00, 0x00,
+    // tag 1
+    0x79, 0x56, 0x34, 0x12,
+    // end offset 1
+    0x01, 0x00, 0x00, 0x00,
+    // tag 2
+    0x78, 0x56, 0x34, 0x13,
+    // end offset 2
+    0x00, 0x00, 0x00, 0x00,
   };
 
-  EXPECT_FALSE(
-      framer.ProcessInput(StringPiece(AsChars(input), arraysize(input))));
-  EXPECT_EQ(QUIC_CRYPTO_TOO_MANY_ENTRIES, framer.error());
+  EXPECT_FALSE(framer.ProcessInput(StringPiece(AsChars(input),
+                                               arraysize(input))));
+  EXPECT_EQ(QUIC_CRYPTO_TAGS_OUT_OF_ORDER, framer.error());
 }
 
-TEST(CryptoFramerTest, ProcessInputZeroLength) {
+TEST(CryptoFramerTest, ProcessInputTooManyEntries) {
   test::TestCryptoVisitor visitor;
   CryptoFramer framer;
   framer.set_visitor(&visitor);
 
   unsigned char input[] = {
     // tag
     0x33, 0x77, 0xAA, 0xFF,
     // num entries
-    0x02, 0x00,
-    // tag 1
-    0x78, 0x56, 0x34, 0x12,
-    // tag 2
-    0x79, 0x56, 0x34, 0x12,
-    // len 1
+    0xA0, 0x00,
+    // padding
     0x00, 0x00,
-    // len 2
-    0x05, 0x00,
   };
 
-  EXPECT_TRUE(
-      framer.ProcessInput(StringPiece(AsChars(input), arraysize(input))));
+  EXPECT_FALSE(framer.ProcessInput(StringPiece(AsChars(input),
+                                               arraysize(input))));
+  EXPECT_EQ(QUIC_CRYPTO_TOO_MANY_ENTRIES, framer.error());
 }
 
-TEST(CryptoFramerTest, ProcessInputInvalidLengthPadding) {
+TEST(CryptoFramerTest, ProcessInputZeroLength) {
   test::TestCryptoVisitor visitor;
   CryptoFramer framer;
   framer.set_visitor(&visitor);
 
   unsigned char input[] = {
     // tag
     0x33, 0x77, 0xAA, 0xFF,
     // num entries
-    0x01, 0x00,
+    0x02, 0x00,
+    // padding
+    0x00, 0x00,
     // tag 1
     0x78, 0x56, 0x34, 0x12,
-    // len 1
-    0x05, 0x00,
-    // padding
-    0x05, 0x00,
+    // end offset 1
+    0x00, 0x00, 0x00, 0x00,
+    // tag 2
+    0x79, 0x56, 0x34, 0x12,
+    // end offset 2
+    0x05, 0x00, 0x00, 0x00,
   };
 
-  EXPECT_FALSE(
-      framer.ProcessInput(StringPiece(AsChars(input), arraysize(input))));
-  EXPECT_EQ(QUIC_CRYPTO_INVALID_VALUE_LENGTH, framer.error());
+  EXPECT_TRUE(framer.ProcessInput(StringPiece(AsChars(input),
+                                              arraysize(input))));
 }
 
 }  // namespace test
 
 }  // namespace net