zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed ability to set CryptoOptions through PeerConnectionFactory from bindings.

Browse Source 
This change removes the ability to set CryptoOptions through the PeerConnection
Factory in both Java and IOS. Native will be removed after the Chromium change
lands. The semantics have been changed such that these options should only be
set on individual PeerConnections and not directly on the Factory itself. This
allows for more flexibility in setting CryptoOptions for PeerConnections which
are created as part of a factory.

Bug: webrtc:10020
Change-Id: I9ef3d431e728927b9ced5de6188cedeb2671254b
Reviewed-on: https://webrtc-review.googlesource.com/c/111560
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Commit-Queue: Benjamin Wright <benwright@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25736}
This commit is contained in:
Benjamin Wright
2018-11-20 13:02:37 -08:00
committed by Commit Bot
parent a526ae65cc
commit e4cccae299
4 changed files with 0 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
sdk/android/api/org/webrtc/PeerConnectionFactory.java
View File

@ -124,29 +124,6 @@ public class PeerConnectionFactory {
public boolean disableEncryption;
public boolean disableNetworkMonitor;
// TODO(webrtc:9891) - The below crypto options are deprecated. Please use
// RTCConfiguration to set these options instead. They will be removed in
// a future release.
/**
* If set to true, the (potentially insecure) crypto cipher SRTP_AES128_CM_SHA1_32
* will be included in the list of supported ciphers during negotiation. It will only
* be used if both peers support it and no other ciphers get preferred.
*/
public boolean enableAes128Sha1_32CryptoCipher;
/**
* Enable GCM crypto suites from RFC 7714 for SRTP. GCM will only be used if both sides enable
* it.
*/
public boolean enableGcmCryptoSuites;
/**
* If set all RtpSenders must have an FrameEncryptor attached to them before they are allowed to
* send packets. All RtpReceivers must have a FrameDecryptor attached to them before they are
* able to receive packets.
*/
public boolean requireFrameEncryption;
@CalledByNative("Options")
int getNetworkIgnoreMask() {
return networkIgnoreMask;
@ -161,24 +138,6 @@ public class PeerConnectionFactory {
boolean getDisableNetworkMonitor() {
return disableNetworkMonitor;
}
@Deprecated
@CalledByNative("Options")
boolean getEnableAes128Sha1_32CryptoCipher() {
return enableAes128Sha1_32CryptoCipher;
}
@Deprecated
@CalledByNative("Options")
boolean getEnableGcmCryptoSuites() {
return enableGcmCryptoSuites;
}
@Deprecated
@CalledByNative("Options")
boolean getRequireFrameEncryption() {
return requireFrameEncryption;
}
}
public static class Builder {