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

net/quic/crypto/chacha20_poly1305_decrypter.cc

Index: net/quic/crypto/chacha20_poly1305_decrypter.cc
diff --git a/net/quic/crypto/chacha20_poly1305_rfc7539_decrypter.cc b/net/quic/crypto/chacha20_poly1305_decrypter.cc
similarity index 57%
rename from net/quic/crypto/chacha20_poly1305_rfc7539_decrypter.cc
rename to net/quic/crypto/chacha20_poly1305_decrypter.cc
index 9a1aa4c82499db9ef3a871fd681cca06a0b18b43..ccd1c242a33ba7df718a6997c1f7f930edb7aa0b 100644
--- a/net/quic/crypto/chacha20_poly1305_rfc7539_decrypter.cc
+++ b/net/quic/crypto/chacha20_poly1305_decrypter.cc
@@ -2,7 +2,7 @@
 // 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 <openssl/evp.h>
 #include <openssl/tls1.h>
@@ -16,7 +16,7 @@ const size_t kNoncePrefixSize = 4;
 
 }  // namespace
 
-ChaCha20Poly1305Rfc7539Decrypter::ChaCha20Poly1305Rfc7539Decrypter()
+ChaCha20Poly1305Decrypter::ChaCha20Poly1305Decrypter()
     : AeadBaseDecrypter(EVP_aead_chacha20_poly1305(),
                         kKeySize,
                         kAuthTagSize,
@@ -26,18 +26,14 @@ ChaCha20Poly1305Rfc7539Decrypter::ChaCha20Poly1305Rfc7539Decrypter()
                 "nonce prefix size too big");
 }
 
-ChaCha20Poly1305Rfc7539Decrypter::~ChaCha20Poly1305Rfc7539Decrypter() {}
+ChaCha20Poly1305Decrypter::~ChaCha20Poly1305Decrypter() {}
 
-bool ChaCha20Poly1305Rfc7539Decrypter::IsSupported() {
-  return true;
+const char* ChaCha20Poly1305Decrypter::cipher_name() const {
+  return TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305;
 }
 
-const char* ChaCha20Poly1305Rfc7539Decrypter::cipher_name() const {
-  return TLS1_TXT_ECDHE_RSA_WITH_CHACHA20_POLY1305_OLD;
-}
-
-uint32_t ChaCha20Poly1305Rfc7539Decrypter::cipher_id() const {
-  return TLS1_CK_ECDHE_RSA_CHACHA20_POLY1305_OLD;
+uint32_t ChaCha20Poly1305Decrypter::cipher_id() const {
+  return TLS1_CK_ECDHE_RSA_CHACHA20_POLY1305;
 }
 
 }  // namespace net