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

Adds new CryptoOption crypto_options.frame.require_frame_encryption.

Browse Source 
This change adds a new subcategory to the public native webrtc::CryptoOptions
structure: webrtc::CryptoOptions::Frame.

This new structure has a single off by default property:
crypto_options.frame.require_frame_encryption.

This new flag if set prevents RtpSenders from sending outgoing payloads unless
a frame_encryptor_ is attached and prevents RtpReceivers from receiving
incoming payloads unless a frame_decryptor_ is attached.

This option is important to enforce no unencrypted data can ever leave the
device or be received.

I have also attached bindings for Java and Objective-C.

I have implemented this functionality for E2EE audio but not E2EE video
since the changes are still in review.

Bug: webrtc:9681
Change-Id: Ie184711190e0cdf5ac781f69e9489ceec904736f
Reviewed-on: https://webrtc-review.googlesource.com/c/105540
Reviewed-by: Niels Moller <nisse@webrtc.org>
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Reviewed-by: Oskar Sundbom <ossu@webrtc.org>
Reviewed-by: Sami Kalliomäki <sakal@webrtc.org>
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Commit-Queue: Benjamin Wright <benwright@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25238}
This commit is contained in:
Benjamin Wright
2018-10-15 10:20:24 -07:00
committed by Commit Bot
parent d932fba3bc
commit bfb444ce2c
24 changed files with 258 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sdk/objc/api/peerconnection/RTCPeerConnectionFactoryOptions.h
View File

@ -35,6 +35,8 @@ RTC_OBJC_EXPORT
@property(nonatomic, assign) BOOL enableGcmCryptoSuites;
@property(nonatomic, assign) BOOL requireFrameEncryption;
- (instancetype)init NS_DESIGNATED_INITIALIZER;
@end

2
sdk/objc/api/peerconnection/RTCPeerConnectionFactoryOptions.mm
View File

@ -36,6 +36,7 @@ void setNetworkBit(webrtc::PeerConnectionFactoryInterface::Options* options,
@synthesize ignoreEthernetNetworkAdapter = _ignoreEthernetNetworkAdapter;
@synthesize enableAes128Sha1_32CryptoCipher = _enableAes128Sha1_32CryptoCipher;
@synthesize enableGcmCryptoSuites = _enableGcmCryptoSuites;
@synthesize requireFrameEncryption = _requireFrameEncryption;
- (instancetype)init {
return [super init];
@ -55,6 +56,7 @@ void setNetworkBit(webrtc::PeerConnectionFactoryInterface::Options* options,
options.crypto_options.srtp.enable_aes128_sha1_32_crypto_cipher =
self.enableAes128Sha1_32CryptoCipher;
options.crypto_options.srtp.enable_gcm_crypto_suites = self.enableGcmCryptoSuites;
options.crypto_options.sframe.require_frame_encryption = self.requireFrameEncryption;
return options;
}