Add ChaCha20Poly1305Encrypter, based on

net/quic/crypto/chacha20_poly1305_encrypter_test.cc

Index: net/quic/crypto/chacha20_poly1305_encrypter_test.cc
===================================================================
--- net/quic/crypto/chacha20_poly1305_encrypter_test.cc	(revision 0)
+++ net/quic/crypto/chacha20_poly1305_encrypter_test.cc	(revision 0)
@@ -0,0 +1,108 @@
+// Copyright (c) 2013 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 "net/quic/crypto/chacha20_poly1305_encrypter.h"
+
+#include "net/quic/test_tools/quic_test_utils.h"
+
+using base::StringPiece;
+
+namespace {
+
+// The test vectors come from draft-agl-tls-chacha20poly1305-04 Section 7.
+
+// Each test vector consists of five strings of lowercase hexadecimal digits.
+// The strings may be empty (zero length). A test vector with a NULL |key|
+// marks the end of an array of test vectors.
+struct TestVector {
+  const char* key;
+  const char* pt;
+  const char* iv;
+  const char* aad;
+  const char* ct;
+};
+
+const TestVector test_vectors[] = {
+  { "4290bcb154173531f314af57f3be3b5006da371ece272afa1b5dbdd110"

[agl, 2014/03/10 15:08:33]

formatting. There's no comma at the end of the line so perhaps the next line
should be indented?

[wtc, 2014/03/11 04:02:02]

Done.

+    "0a1007",
+    "86d09974840bded2a5ca",
+    "cd7cf67be39c794a",
+    "87e229d4500845a079c0",
+    "e3e446f7ede9a19b62a4677dabf4e3d24b876bb284753896e1d6"
+  },
+  { NULL }
+};
+
+}  // namespace
+
+namespace net {
+namespace test {
+
+// EncryptWithNonce wraps the |Encrypt| method of |encrypter| to allow passing
+// in an nonce and also to allocate the buffer needed for the ciphertext.
+QuicData* EncryptWithNonce(ChaCha20Poly1305Encrypter* encrypter,
+                           StringPiece nonce,
+                           StringPiece associated_data,
+                           StringPiece plaintext) {
+  size_t ciphertext_size = encrypter->GetCiphertextSize(plaintext.length());
+  scoped_ptr<char[]> ciphertext(new char[ciphertext_size]);
+
+  if (!encrypter->Encrypt(nonce, associated_data, plaintext,
+                          reinterpret_cast<unsigned char*>(ciphertext.get()))) {
+    return NULL;
+  }
+
+  return new QuicData(ciphertext.release(), ciphertext_size, true);
+}
+
+TEST(ChaCha20Poly1305EncrypterTest, Encrypt) {
+  if (!ChaCha20Poly1305Encrypter::IsSupported()) {
+    LOG(INFO) << "ChaCha20+Poly1305 not supported. Test skipped.";
+    return;
+  }
+
+  for (size_t i = 0; test_vectors[i].key != NULL; i++) {
+    // Decode the test vector.
+    string key;
+    string pt;
+    string iv;
+    string aad;
+    string ct;
+    ASSERT_TRUE(DecodeHexString(test_vectors[i].key, &key));
+    ASSERT_TRUE(DecodeHexString(test_vectors[i].pt, &pt));
+    ASSERT_TRUE(DecodeHexString(test_vectors[i].iv, &iv));
+    ASSERT_TRUE(DecodeHexString(test_vectors[i].aad, &aad));
+    ASSERT_TRUE(DecodeHexString(test_vectors[i].ct, &ct));
+
+    ChaCha20Poly1305Encrypter encrypter;
+    ASSERT_TRUE(encrypter.SetKey(key));
+    scoped_ptr<QuicData> encrypted(EncryptWithNonce(
+        &encrypter, iv,
+        // This deliberately tests that the encrypter can handle an AAD that
+        // is set to NULL, as opposed to a zero-length, non-NULL pointer.
+        StringPiece(aad.length() ? aad.data() : NULL, aad.length()), pt));
+    ASSERT_TRUE(encrypted.get());
+
+    test::CompareCharArraysWithHexError("ciphertext", encrypted->data(),
+                                        encrypted->length(), ct.data(),
+                                        ct.length());
+  }
+}
+
+TEST(ChaCha20Poly1305EncrypterTest, GetMaxPlaintextSize) {
+  ChaCha20Poly1305Encrypter encrypter;
+  EXPECT_EQ(1000u, encrypter.GetMaxPlaintextSize(1016));
+  EXPECT_EQ(100u, encrypter.GetMaxPlaintextSize(116));
+  EXPECT_EQ(10u, encrypter.GetMaxPlaintextSize(26));
+}
+
+TEST(ChaCha20Poly1305EncrypterTest, GetCiphertextSize) {
+  ChaCha20Poly1305Encrypter encrypter;
+  EXPECT_EQ(1016u, encrypter.GetCiphertextSize(1000));
+  EXPECT_EQ(116u, encrypter.GetCiphertextSize(100));
+  EXPECT_EQ(26u, encrypter.GetCiphertextSize(10));
+}
+
+}  // namespace test
+}  // namespace net
Property changes on: net/quic/crypto/chacha20_poly1305_encrypter_test.cc
___________________________________________________________________
Added: svn:eol-style
   + LF