Landing Recent QUIC changes until 01/28/2016 18:41 UTC

net/quic/crypto/quic_crypto_server_config.cc

Index: net/quic/crypto/quic_crypto_server_config.cc
diff --git a/net/quic/crypto/quic_crypto_server_config.cc b/net/quic/crypto/quic_crypto_server_config.cc
index ab8202a605674ebb9f43f3a9173c748932945081..fd4e13284a8062c502fd88fa86145be94ffd8ad4 100644
--- a/net/quic/crypto/quic_crypto_server_config.cc
+++ b/net/quic/crypto/quic_crypto_server_config.cc
@@ -290,11 +290,15 @@ QuicServerConfigProtobuf* QuicCryptoServerConfig::GenerateConfig(
   } else {
     msg.SetTaglist(kKEXS, kC255, 0);
   }
-  if (FLAGS_quic_use_rfc7539 &&
-      ChaCha20Poly1305Rfc7539Encrypter::IsSupported()) {
-    msg.SetTaglist(kAEAD, kAESG, kCC12, kCC20, 0);
+  if (FLAGS_quic_crypto_server_config_default_has_chacha20) {
+    if (FLAGS_quic_use_rfc7539 &&
+        ChaCha20Poly1305Rfc7539Encrypter::IsSupported()) {
+      msg.SetTaglist(kAEAD, kAESG, kCC12, kCC20, 0);
+    } else {
+      msg.SetTaglist(kAEAD, kAESG, kCC12, 0);
+    }
   } else {
-    msg.SetTaglist(kAEAD, kAESG, kCC12, 0);
+    msg.SetTaglist(kAEAD, kAESG, 0);
   }
   msg.SetStringPiece(kPUBS, encoded_public_values);