Update references to TLS1_CK_ECDHE_RSA_CHACHA20_POLY1305, etc.

webrtc/base/opensslstreamadapter.cc

Index: webrtc/base/opensslstreamadapter.cc
diff --git a/webrtc/base/opensslstreamadapter.cc b/webrtc/base/opensslstreamadapter.cc
index 9c3a09ecc06bfe05105bfc6749471c7240cebad3..346b44289d081df0509b6b30a4ceb8743478b0f3 100644
--- a/webrtc/base/opensslstreamadapter.cc
+++ b/webrtc/base/opensslstreamadapter.cc
@@ -158,10 +158,12 @@ static int kDefaultSslCipher12 =
 static int kDefaultSslEcCipher12 =
     static_cast<uint16_t>(TLS1_CK_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256);
 // Fallback cipher for DTLS 1.2 if hardware-accelerated AES-GCM is unavailable.
+// TODO(davidben): Switch to the standardized CHACHA20_POLY1305 variant when
+// available.
 static int kDefaultSslCipher12NoAesGcm =
-    static_cast<uint16_t>(TLS1_CK_ECDHE_RSA_CHACHA20_POLY1305);
+    static_cast<uint16_t>(TLS1_CK_ECDHE_RSA_CHACHA20_POLY1305_OLD);
 static int kDefaultSslEcCipher12NoAesGcm =
-    static_cast<uint16_t>(TLS1_CK_ECDHE_ECDSA_CHACHA20_POLY1305);
+    static_cast<uint16_t>(TLS1_CK_ECDHE_ECDSA_CHACHA20_POLY1305_OLD);

[pthatcher2, 2015/11/16 23:24:17]

Can we also rename this? 

Perhaps: 

kDefaultSslCipher12NoAesGcmDraft 
kDefaultSslEcCipher12NoAesGcDraft 

?

[davidben_webrtc, 2015/11/16 23:39:28]

I don't think we want to. This is kDefaultSslCipher12NoAesGcm as in "default ssl
cipher, when using TLS 1.2, and we have no hardware AES-GCM".

(Hrm. When we do get around to adding the non-draft cipher, there may be some
fiddling to be done here to make sure the WebRTC build isn't temporarily broken.
Meh. We'll worry about that when we get there.)

 #else  // !OPENSSL_IS_BORINGSSL
 // OpenSSL sorts differently than BoringSSL, so the default cipher doesn't
 // change between TLS 1.0 and TLS 1.2 with the current setup.