Remove the non-RFC 7539 variants of ChaCha20Poly1305 crypters in QUIC

net/quic/crypto/crypto_protocol.h

 // 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.
 
 #ifndef NET_QUIC_CRYPTO_CRYPTO_PROTOCOL_H_
 #define NET_QUIC_CRYPTO_CRYPTO_PROTOCOL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 29 matching lines @@
 const QuicTag kPRST = TAG('P', 'R', 'S', 'T');   // Public reset
 const QuicTag kSCUP = TAG('S', 'C', 'U', 'P');   // Server config update.
 
 // Key exchange methods
 const QuicTag kP256 = TAG('P', '2', '5', '6');   // ECDH, Curve P-256
 const QuicTag kC255 = TAG('C', '2', '5', '5');   // ECDH, Curve25519
 
 // AEAD algorithms
 const QuicTag kNULL = TAG('N', 'U', 'L', 'N');   // null algorithm
 const QuicTag kAESG = TAG('A', 'E', 'S', 'G');   // AES128 + GCM-12
-const QuicTag kCC12 = TAG('C', 'C', '1', '2');   // ChaCha20 + Poly1305
 const QuicTag kCC20 = TAG('C', 'C', '2', '0');   // ChaCha20 + Poly1305 RFC7539

[davidben, 2016/04/04 20:22:39]

(Probably for a follow-up, but I'd suggest getting rid of all the RFC7539
suffixes now that the old one doesn't exist.)

[Ryan Hamilton, 2016/04/04 20:34:12]

Totally will do so after all this sorts itself out. Doing the rename and the
delete will likely confuse git history. :/

 
 // Socket receive buffer
 const QuicTag kSRBF = TAG('S', 'R', 'B', 'F');   // Socket receive buffer
 
 // Congestion control feedback types
 const QuicTag kQBIC = TAG('Q', 'B', 'I', 'C');   // TCP cubic
 
 // Connection options (COPT) values
 const QuicTag kAFCW = TAG('A', 'F', 'C', 'W');   // Auto-tune flow control
                                                  // receive windows.
@@ skipping 161 matching lines @@
 // amplification factor of any mirror DoS attack.
 //
 // A client may pad an inchoate client hello to a size larger than
 // kClientHelloMinimumSize to make it more likely to receive a complete
 // rejection message.
 const size_t kClientHelloMinimumSize = 1024;
 
 }  // namespace net
 
 #endif  // NET_QUIC_CRYPTO_CRYPTO_PROTOCOL_H_