From aad6780e5c25b1622904ef83659461706f6a25db Mon Sep 17 00:00:00 2001 From: torbjorng Date: Thu, 7 Apr 2016 08:55:28 -0700 Subject: [PATCH] Protect some cipher suites with ifdefs for legacy openssl compatibility. BUG=webrtc:5714 Review URL: https://codereview.webrtc.org/1851303002 Cr-Commit-Position: refs/heads/master@{#12284} --- webrtc/base/opensslstreamadapter.cc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/webrtc/base/opensslstreamadapter.cc b/webrtc/base/opensslstreamadapter.cc index 16dd9803b4..b09c2a581e 100644 --- a/webrtc/base/opensslstreamadapter.cc +++ b/webrtc/base/opensslstreamadapter.cc @@ -18,6 +18,9 @@ #include #include #include +#ifndef OPENSSL_IS_BORINGSSL +#include +#endif #include @@ -1138,7 +1141,9 @@ static const cipher_list OK_RSA_ciphers[] = { #ifdef TLS1_CK_ECDHE_RSA_WITH_AES_256_GCM_SHA256 CDEF(ECDHE_RSA_WITH_AES_256_GCM_SHA256), #endif +#ifdef TLS1_CK_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 CDEF(ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256), +#endif }; static const cipher_list OK_ECDSA_ciphers[] = { @@ -1148,7 +1153,9 @@ static const cipher_list OK_ECDSA_ciphers[] = { #ifdef TLS1_CK_ECDHE_ECDSA_WITH_AES_256_GCM_SHA256 CDEF(ECDHE_ECDSA_WITH_AES_256_GCM_SHA256), #endif +#ifdef TLS1_CK_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256 CDEF(ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256), +#endif }; #undef CDEF