mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-20 00:57:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removes backwards compatability CryptoOptions support.

Browse source 
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}
This commit is contained in:
Benjamin Wright 2018-10-12 09:26:57 -07:00 committed by Commit Bot
parent 23e48fb5fd
commit 5e23a41ef4
3 changed files with 0 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
api/crypto/cryptooptions.cc
View file

@ -16,9 +16,6 @@ namespace webrtc {
CryptoOptions::CryptoOptions() {} CryptoOptions::CryptoOptions() {}
CryptoOptions::CryptoOptions(const CryptoOptions& other) { 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; srtp = other.srtp;
} }

11
api/crypto/cryptooptions.h
View file

@ -33,17 +33,6 @@ struct CryptoOptions {
// of crypto options. // of crypto options.
std::vector<int> GetSupportedDtlsSrtpCryptoSuites() const; 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. // SRTP Related Peer Connection options.
struct Srtp { struct Srtp {
// Enable GCM crypto suites from RFC 7714 for SRTP. GCM will only be used // Enable GCM crypto suites from RFC 7714 for SRTP. GCM will only be used

15
pc/peerconnectionfactory.cc
View file

@ -234,21 +234,6 @@ bool PeerConnectionFactory::Initialize() {
void PeerConnectionFactory::SetOptions(const Options& options) { void PeerConnectionFactory::SetOptions(const Options& options) {
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( RtpCapabilities PeerConnectionFactory::GetRtpSenderCapabilities(