Removes backwards compatability CryptoOptions support.
CryptoOptions provided top level optional fields to support Chromium and
internal use cases. These locations have been updated to use the new API and
this CL removes these legacy compatability options.
This CL will be checked in after the chromium CL lands:
https://chromium-review.googlesource.com/c/chromium/src/+/1275025
Bug: webrtc:9860
Change-Id: I2790b42c91c49b83e5380a5271df2ceda556c53f
Reviewed-on: https://webrtc-review.googlesource.com/c/105644
Commit-Queue: Benjamin Wright <benwright@webrtc.org>
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25148}diff --git a/api/crypto/cryptooptions.cc b/api/crypto/cryptooptions.cc
index ed6db47..2c34822 100644
--- a/api/crypto/cryptooptions.cc
+++ b/api/crypto/cryptooptions.cc
@@ -16,9 +16,6 @@
CryptoOptions::CryptoOptions() {}
CryptoOptions::CryptoOptions(const CryptoOptions& other) {
- enable_gcm_crypto_suites = other.enable_gcm_crypto_suites;
- enable_encrypted_rtp_header_extensions =
- other.enable_encrypted_rtp_header_extensions;
srtp = other.srtp;
}
diff --git a/api/crypto/cryptooptions.h b/api/crypto/cryptooptions.h
index 0ac973f..de674c2 100644
--- a/api/crypto/cryptooptions.h
+++ b/api/crypto/cryptooptions.h
@@ -33,17 +33,6 @@
// of crypto options.
std::vector<int> GetSupportedDtlsSrtpCryptoSuites() const;
- // TODO(webrtc:9859) - Remove duplicates once chromium is fixed.
- // Will be removed once srtp.enable_gcm_crypto_suites is updated in Chrome.
- absl::optional<bool> enable_gcm_crypto_suites;
- // TODO(webrtc:9859) - Remove duplicates once chromium is fixed.
- // Will be removed once srtp.enable_encrypted_rtp_header_extensions is
- // updated in Chrome.
- absl::optional<bool> enable_encrypted_rtp_header_extensions;
- // Will be removed once srtp.enable_encrypted_rtp_header_extensions is
- // updated in Tacl.
- absl::optional<bool> enable_aes128_sha1_32_crypto_cipher;
-
// SRTP Related Peer Connection options.
struct Srtp {
// Enable GCM crypto suites from RFC 7714 for SRTP. GCM will only be used
diff --git a/pc/peerconnectionfactory.cc b/pc/peerconnectionfactory.cc
index fd4ec0b..edc13034 100644
--- a/pc/peerconnectionfactory.cc
+++ b/pc/peerconnectionfactory.cc
@@ -234,21 +234,6 @@
void PeerConnectionFactory::SetOptions(const Options& options) {
options_ = options;
- // TODO(webrtc:9859) - Remove Chromium Compatibility once fix lands in
- // Chromium
- if (options.crypto_options.enable_gcm_crypto_suites.has_value()) {
- options_.crypto_options.srtp.enable_gcm_crypto_suites =
- *options.crypto_options.enable_gcm_crypto_suites;
- }
- if (options.crypto_options.enable_encrypted_rtp_header_extensions
- .has_value()) {
- options_.crypto_options.srtp.enable_encrypted_rtp_header_extensions =
- *options.crypto_options.enable_encrypted_rtp_header_extensions;
- }
- if (options.crypto_options.enable_aes128_sha1_32_crypto_cipher.has_value()) {
- options_.crypto_options.srtp.enable_aes128_sha1_32_crypto_cipher =
- *options.crypto_options.enable_aes128_sha1_32_crypto_cipher;
- }
}
RtpCapabilities PeerConnectionFactory::GetRtpSenderCapabilities(
