Landing Recent QUIC changes until 4/22/2016 14:55 UTC

net/quic/crypto/chacha20_poly1305_decrypter_test.cc

 // Copyright 2014 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_rfc7539_decrypter.h"
+#include "net/quic/crypto/chacha20_poly1305_decrypter.h"
 
 #include <memory>
 
 #include "net/quic/quic_flags.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 
 using base::StringPiece;
 using std::string;
 
 namespace {
@@ skipping 89 matching lines @@
      nullptr},
     {nullptr}};
 
 }  // namespace
 
 namespace net {
 namespace test {
 
 // DecryptWithNonce wraps the |Decrypt| method of |decrypter| to allow passing
 // in an nonce and also to allocate the buffer needed for the plaintext.
-QuicData* DecryptWithNonce(ChaCha20Poly1305Rfc7539Decrypter* decrypter,
+QuicData* DecryptWithNonce(ChaCha20Poly1305Decrypter* decrypter,
                            StringPiece nonce,
                            StringPiece associated_data,
                            StringPiece ciphertext) {
   QuicPathId path_id = kDefaultPathId;
   QuicPacketNumber packet_number;
   StringPiece nonce_prefix(nonce.data(), nonce.size() - sizeof(packet_number));
   decrypter->SetNoncePrefix(nonce_prefix);
   memcpy(&packet_number, nonce.data() + nonce_prefix.size(),
          sizeof(packet_number));
   path_id = static_cast<QuicPathId>(
       packet_number >> 8 * (sizeof(packet_number) - sizeof(path_id)));
   packet_number &= UINT64_C(0x00FFFFFFFFFFFFFF);
   std::unique_ptr<char[]> output(new char[ciphertext.length()]);
   size_t output_length = 0;
   const bool success = decrypter->DecryptPacket(
       path_id, packet_number, associated_data, ciphertext, output.get(),
       &output_length, ciphertext.length());
   if (!success) {
     return nullptr;
   }
   return new QuicData(output.release(), output_length, true);
 }
 
-TEST(ChaCha20Poly1305Rfc7539DecrypterTest, Decrypt) {
-  if (!ChaCha20Poly1305Rfc7539Decrypter::IsSupported()) {
-    VLOG(1) << "ChaCha20+Poly1305 not supported. Test skipped.";
-    return;
-  }
+TEST(ChaCha20Poly1305DecrypterTest, Decrypt) {
   for (size_t i = 0; test_vectors[i].key != nullptr; i++) {
     // If not present then decryption is expected to fail.
     bool has_pt = test_vectors[i].pt;
 
     // Decode the test vector.
     string key;
     string iv;
     string fixed;
     string aad;
     string ct;
     string pt;
     ASSERT_TRUE(DecodeHexString(test_vectors[i].key, &key));
     ASSERT_TRUE(DecodeHexString(test_vectors[i].iv, &iv));
     ASSERT_TRUE(DecodeHexString(test_vectors[i].fixed, &fixed));
     ASSERT_TRUE(DecodeHexString(test_vectors[i].aad, &aad));
     ASSERT_TRUE(DecodeHexString(test_vectors[i].ct, &ct));
     if (has_pt) {
       ASSERT_TRUE(DecodeHexString(test_vectors[i].pt, &pt));
     }
 
-    ChaCha20Poly1305Rfc7539Decrypter decrypter;
+    ChaCha20Poly1305Decrypter decrypter;
     ASSERT_TRUE(decrypter.SetKey(key));
     std::unique_ptr<QuicData> decrypted(DecryptWithNonce(
         &decrypter, fixed + iv,
         // This deliberately tests that the decrypter can handle an AAD that
         // is set to nullptr, as opposed to a zero-length, non-nullptr pointer.
         StringPiece(aad.length() ? aad.data() : nullptr, aad.length()), ct));
     if (!decrypted.get()) {
       EXPECT_FALSE(has_pt);
       continue;
     }
     EXPECT_TRUE(has_pt);
 
     EXPECT_EQ(12u, ct.size() - decrypted->length());
     ASSERT_EQ(pt.length(), decrypted->length());
     test::CompareCharArraysWithHexError("plaintext", decrypted->data(),
                                         pt.length(), pt.data(), pt.length());
   }
 }
 
 }  // namespace test
 }  // namespace net