| Index: talk/session/media/mediasession.cc
|
| diff --git a/talk/session/media/mediasession.cc b/talk/session/media/mediasession.cc
|
| index 66d0caf9d774cd9dc3b80b9f79e7d551b6e5f2a6..7d94784d9b3679ebbe9de2d1a67d9de0337d6f47 100644
|
| --- a/talk/session/media/mediasession.cc
|
| +++ b/talk/session/media/mediasession.cc
|
| @@ -155,8 +155,8 @@ bool FindMatchingCrypto(const CryptoParamsVec& cryptos,
|
| void GetSupportedAudioCryptoSuites(
|
| std::vector<std::string>* crypto_suites) {
|
| #ifdef HAVE_SRTP
|
| - crypto_suites->push_back(CS_AES_CM_128_HMAC_SHA1_32);
|
| - crypto_suites->push_back(CS_AES_CM_128_HMAC_SHA1_80);
|
| + crypto_suites->push_back(rtc::CS_AES_CM_128_HMAC_SHA1_32);
|
| + crypto_suites->push_back(rtc::CS_AES_CM_128_HMAC_SHA1_80);
|
| #endif
|
| }
|
|
|
| @@ -173,7 +173,7 @@ void GetSupportedDataCryptoSuites(
|
| void GetSupportedDefaultCryptoSuites(
|
| std::vector<std::string>* crypto_suites) {
|
| #ifdef HAVE_SRTP
|
| - crypto_suites->push_back(CS_AES_CM_128_HMAC_SHA1_80);
|
| + crypto_suites->push_back(rtc::CS_AES_CM_128_HMAC_SHA1_80);
|
| #endif
|
| }
|
|
|
| @@ -188,8 +188,9 @@ static bool SelectCrypto(const MediaContentDescription* offer,
|
|
|
| for (CryptoParamsVec::const_iterator i = cryptos.begin();
|
| i != cryptos.end(); ++i) {
|
| - if (CS_AES_CM_128_HMAC_SHA1_80 == i->cipher_suite ||
|
| - (CS_AES_CM_128_HMAC_SHA1_32 == i->cipher_suite && audio && !bundle)) {
|
| + if (rtc::CS_AES_CM_128_HMAC_SHA1_80 == i->cipher_suite ||
|
| + (rtc::CS_AES_CM_128_HMAC_SHA1_32 == i->cipher_suite && audio &&
|
| + !bundle)) {
|
| return CreateCryptoParams(i->tag, i->cipher_suite, crypto);
|
| }
|
| }
|
|
|