commit 87cfcdb6dfdfda6b6073cad36636710f3517e8f5
author David Benjamin <davidben@chromium.org> Wed Oct 28 14:32:42 2015 -0400
committer Adam Langley <agl@google.com> Wed Oct 28 19:25:36 2015 +0000
tree e14617cf57dabf3721387923740056a51c13bf01
parent 7dd3f77256083a38102657be318dd4901e34f34e

Resolve another ChaCha20-Poly1305 rename deadlock.

WebRTC can't roll into Chromium without picking up the iOS build fix, but we
can't roll BoringSSL forwards because WebRTC also depends on the previously
exposed ChaCha20-Poly1305 cipher suite constants.

Define the old constants again.

Change-Id: If8434a0317e42b3aebe1bc1c5a58ed97a89a0230
Reviewed-on: https://boringssl-review.googlesource.com/6382
Reviewed-by: Adam Langley <agl@google.com>

include/openssl/tls1.h

diff --git a/include/openssl/tls1.h b/include/openssl/tls1.h
index 1f4e3c7..bf59d22 100644
--- a/include/openssl/tls1.h
+++ b/include/openssl/tls1.h
@@ -430,6 +430,13 @@
 #define TLS1_CK_ECDHE_RSA_CHACHA20_POLY1305_OLD 0x0300CC13
 #define TLS1_CK_ECDHE_ECDSA_CHACHA20_POLY1305_OLD 0x0300CC14
 
+/* TODO(davidben): Remove these once WebRTC is no longer using them, so they
+ * may point to the future RFC 7539 variant. */
+#define TLS1_CK_ECDHE_RSA_CHACHA20_POLY1305 \
+    TLS1_CK_ECDHE_RSA_CHACHA20_POLY1305_OLD
+#define TLS1_CK_ECDHE_ECDSA_CHACHA20_POLY1305 \
+    TLS1_CK_ECDHE_ECDSA_CHACHA20_POLY1305_OLD
+
 /* XXX
  * Inconsistency alert:
  * The OpenSSL names of ciphers with ephemeral DH here include the string