Commit f3d8f051 authored by Benjamin Wright's avatar Benjamin Wright Committed by Commit Bot

Update PeerConnectionDependencyFactory to use CryptoOptions::Srtp.

This change updates Chromium to use CryptoOptions::Srtp fields to configure the
command line switches for WebRTC crypto instead of the old deprecated fields.

This API was changed in: https://webrtc-review.googlesource.com/c/src/+/105180

Once this change lands the top level fields:
  absl::optional<bool> enable_gcm_crypto_suites and
  absl::optional<bool> enable_encrypted_rtp_header_extensions

Will be removed and their replacements will be under the Srtp sub struct.

Bug: webrtc:9859
Change-Id: I3f140097b870da8a6dd6a691f05298775a468230
Reviewed-on: https://chromium-review.googlesource.com/c/1275025Reviewed-by: default avatarFlorent Castelli <orphis@chromium.org>
Commit-Queue: Ben Wright <benwright@chromium.org>
Cr-Commit-Position: refs/heads/master@{#599261}
parent 6fd818d6
...@@ -336,9 +336,9 @@ void PeerConnectionDependencyFactory::InitializeSignalingThread( ...@@ -336,9 +336,9 @@ void PeerConnectionDependencyFactory::InitializeSignalingThread(
factory_options.disable_sctp_data_channels = false; factory_options.disable_sctp_data_channels = false;
factory_options.disable_encryption = factory_options.disable_encryption =
cmd_line->HasSwitch(switches::kDisableWebRtcEncryption); cmd_line->HasSwitch(switches::kDisableWebRtcEncryption);
factory_options.crypto_options.enable_gcm_crypto_suites = factory_options.crypto_options.srtp.enable_gcm_crypto_suites =
cmd_line->HasSwitch(switches::kEnableWebRtcSrtpAesGcm); cmd_line->HasSwitch(switches::kEnableWebRtcSrtpAesGcm);
factory_options.crypto_options.enable_encrypted_rtp_header_extensions = factory_options.crypto_options.srtp.enable_encrypted_rtp_header_extensions =
cmd_line->HasSwitch(switches::kEnableWebRtcSrtpEncryptedHeaders); cmd_line->HasSwitch(switches::kEnableWebRtcSrtpEncryptedHeaders);
pc_factory_->SetOptions(factory_options); pc_factory_->SetOptions(factory_options);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment