From 4b9d1dec5aec9e5069702a2089f00f56622e2d0c Mon Sep 17 00:00:00 2001 From: torbjorng Date: Sat, 9 Apr 2016 11:35:29 -0700 Subject: [PATCH] OpenSSL/BoringSSL compatibility fixes. With this CL, legacy OpenSSL should work again. BUG=webrtc:5714 Review URL: https://codereview.webrtc.org/1868033005 Cr-Commit-Position: refs/heads/master@{#12300} --- webrtc/base/sslstreamadapter.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/webrtc/base/sslstreamadapter.h b/webrtc/base/sslstreamadapter.h index f6f0befa05..9a9446267d 100644 --- a/webrtc/base/sslstreamadapter.h +++ b/webrtc/base/sslstreamadapter.h @@ -24,8 +24,12 @@ const int TLS_NULL_WITH_NULL_NULL = 0; // Constants for SRTP profiles. const int SRTP_INVALID_CRYPTO_SUITE = 0; +#ifndef SRTP_AES128_CM_SHA1_80 const int SRTP_AES128_CM_SHA1_80 = 0x0001; +#endif +#ifndef SRTP_AES128_CM_SHA1_32 const int SRTP_AES128_CM_SHA1_32 = 0x0002; +#endif // Cipher suite to use for SRTP. Typically a 80-bit HMAC will be used, except // in applications (voice) where the additional bandwidth may be significant.