commit aad6780e5c25b1622904ef83659461706f6a25db
author torbjorng <torbjorng@webrtc.org> Thu Apr 07 15:55:28 2016
committer Commit bot <commit-bot@chromium.org> Thu Apr 07 15:55:33 2016
tree 0fa195e9a871b5cf4dc8d5f57bd9d45ce92852bc
parent 39530c489139b49f5c5b1df3e885a153f54571ba

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

diff --git a/webrtc/base/opensslstreamadapter.cc b/webrtc/base/opensslstreamadapter.cc
index 16dd980..b09c2a5 100644
--- a/webrtc/base/opensslstreamadapter.cc
+++ b/webrtc/base/opensslstreamadapter.cc
@@ -18,6 +18,9 @@
 #include <openssl/rand.h>
 #include <openssl/tls1.h>
 #include <openssl/x509v3.h>
+#ifndef OPENSSL_IS_BORINGSSL
+#include <openssl/dtls1.h>
+#endif
 
 #include <vector>
 
@@ -1138,7 +1141,9 @@
 #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 @@
 #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