admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Protect some cipher suites with ifdefs for legacy openssl compatibility.

Browse Source 
BUG=webrtc:5714

Review URL: https://codereview.webrtc.org/1851303002

Cr-Commit-Position: refs/heads/master@{#12284}
This commit is contained in:
torbjorng 2016-04-07 08:55:28 -07:00 committed by Commit bot
parent 39530c4891
commit aad6780e5c
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
webrtc/base/opensslstreamadapter.cc
View File

@ -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 @@ 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