kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Resolve another ChaCha20-Poly1305 rename deadlock.

Browse Source 
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>
This commit is contained in:
David Benjamin 2015-10-28 14:32:42 -04:00 committed by Adam Langley
parent 7dd3f77256
commit 87cfcdb6df
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/openssl/tls1.h
View File

@ -430,6 +430,13 @@ extern "C" {
#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