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

5
sdk/android/src/jni/pc/peerconnectionfactory.cc
View File

@ -54,6 +54,8 @@ JavaToNativePeerConnectionFactoryOptions(JNIEnv* jni,
Java_Options_getEnableAes128Sha1_32CryptoCipher(jni, options);
bool enable_gcm_crypto_suites =
Java_Options_getEnableGcmCryptoSuites(jni, options);
bool require_frame_encryption =
Java_Options_getRequireFrameEncryption(jni, options);
PeerConnectionFactoryInterface::Options native_options;
@ -67,6 +69,9 @@ JavaToNativePeerConnectionFactoryOptions(JNIEnv* jni,
enable_aes128_sha1_32_crypto_cipher;
native_options.crypto_options.srtp.enable_gcm_crypto_suites =
enable_gcm_crypto_suites;
native_options.crypto_options.sframe.require_frame_encryption =
require_frame_encryption;
return native_options;
}