Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(649)

Unified Diff: webrtc/pc/channelmanager.cc

Issue 2720663003: Support GCM ciphers even if ENABLE_EXTERNAL_AUTH is defined. (Closed)
Patch Set: Fixed win_x64 compile errors (added explicit casts). Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/pc/channel.cc ('k') | webrtc/pc/srtpfilter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/pc/channelmanager.cc
diff --git a/webrtc/pc/channelmanager.cc b/webrtc/pc/channelmanager.cc
index 150dfd9a9d7124aedf347f924bd7ecfe1cfad0f5..f2e0d719ff3205f829e2a53e1913535518352a9b 100644
--- a/webrtc/pc/channelmanager.cc
+++ b/webrtc/pc/channelmanager.cc
@@ -101,14 +101,6 @@ bool ChannelManager::SetCryptoOptions_w(
LOG(LS_WARNING) << "Not changing crypto options in existing channels.";
}
crypto_options_ = crypto_options;
-#if defined(ENABLE_EXTERNAL_AUTH)
- if (crypto_options_.enable_gcm_crypto_suites) {
- // TODO(jbauch): Re-enable once https://crbug.com/628400 is resolved.
- crypto_options_.enable_gcm_crypto_suites = false;
- LOG(LS_WARNING) << "GCM ciphers are not supported with " <<
- "ENABLE_EXTERNAL_AUTH and will be disabled.";
- }
-#endif
return true;
}
« no previous file with comments | « webrtc/pc/channel.cc ('k') | webrtc/pc/srtpfilter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698